[Uml-devel] KDE/kdesdk/umbrello/umbrello

Christian Ehrlicher Ch.Ehrlicher at gmx.de
Sat Oct 13 20:59:13 UTC 2007


SVN commit 724918 by chehrlic:

qt3support--

 M  +1 -1      codeimport/cppimport.cpp  
 M  +2 -2      codeimport/import_utils.cpp  
 M  +3 -3      codeimport/kdevcppparser/driver.cpp  
 M  +1 -1      hierarchicalcodeblock.cpp  
 M  +2 -2      messagewidget.h  
 M  +5 -5      model_utils.cpp  
 M  +1 -1      objectwidget.h  
 M  +2 -1      ownedcodeblock.cpp  
 M  +2 -2      pluginloader.cpp  
 M  +1 -3      statewidget.cpp  
 M  +2 -1      uml.cpp  
 M  +1 -1      umlviewimageexporter.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/codeimport/cppimport.cpp #724917:724918
@@ -57,7 +57,7 @@
     if (! deps.empty()) {
         QMap<QString, Dependence>::Iterator it;
         for (it = deps.begin(); it != deps.end(); ++it) {
-            if (it.data().second == Dep_Global)  // don't want these
+            if (it.value().second == Dep_Global)  // don't want these
                 continue;
             QString includeFile = it.key();
             if (includeFile.isEmpty()) {
--- trunk/KDE/kdesdk/umbrello/umbrello/codeimport/import_utils.cpp #724917:724918
@@ -90,7 +90,7 @@
     QString& first = lines.first();
     QRegExp wordex("\\w");
     if (first.startsWith("/*")) {
-        int wordpos = wordex.search(first);
+        int wordpos = wordex.indexIn(first);
         if (wordpos != -1)
             first = first.mid(wordpos);  // remove comment start
         else
@@ -250,7 +250,7 @@
     if (gRelatedClassifier == NULL || gRelatedClassifier == o)
         return o;
     QRegExp templateInstantiation("^[\\w:\\.]+\\s*<(.*)>");
-    int pos = templateInstantiation.search(name);
+    int pos = templateInstantiation.indexIn(name);
     if (pos == -1)
         return o;
     // Create dependencies on template parameters.
--- trunk/KDE/kdesdk/umbrello/umbrello/codeimport/kdevcppparser/driver.cpp #724917:724918
@@ -107,7 +107,7 @@
     QMap<QString, TranslationUnitAST*>::Iterator it = m_parsedUnits.find( fileName );
     if( it != m_parsedUnits.end() ){
 	TranslationUnitAST* unit = *it;
-	m_parsedUnits.remove( it );
+	m_parsedUnits.erase( it );
 	delete( unit );
     }
 }
@@ -182,7 +182,7 @@
 {
     QMap<QString, QMap<QString, Dependence> >::Iterator it = m_dependences.find( fileName );
     if( it != m_dependences.end() )
-        return it.data();
+        return it.value();
 
     QMap<QString, Dependence> l;
     m_dependences.insert( fileName, l );
@@ -193,7 +193,7 @@
 {
     QMap<QString, Q3ValueList<Problem> >::Iterator it = m_problems.find( fileName );
     if( it != m_problems.end() )
-        return it.data();
+        return it.value();
 
     Q3ValueList<Problem> l;
     m_problems.insert( fileName, l );
--- trunk/KDE/kdesdk/umbrello/umbrello/hierarchicalcodeblock.cpp #724917:724918
@@ -187,7 +187,7 @@
     QString tag = remove_object->getTag();
     if(!(tag.isEmpty()))
     {
-        m_textBlockTagMap.erase(tag);
+        m_textBlockTagMap.remove(tag);
         getParentDocument()->removeChildTagFromMap(tag);
     }
     return true;
--- trunk/KDE/kdesdk/umbrello/umbrello/messagewidget.h #724917:724918
@@ -437,8 +437,8 @@
     Uml::Sequence_Message_Type m_sequenceMessageType;
 
 private:
-    void moveEvent(QMoveEvent */*m*/);
-    void resizeEvent(QResizeEvent */*re*/);
+    void moveEvent(QMoveEvent *m);
+    void resizeEvent(QResizeEvent *re);
 
     ObjectWidget * m_pOw[2];
     FloatingTextWidget * m_pFText;
--- trunk/KDE/kdesdk/umbrello/umbrello/model_utils.cpp #724917:724918
@@ -401,7 +401,7 @@
 
 int stringToDirection(QString input, Uml::Parameter_Direction & result) {
     QRegExp dirx("^(in|out|inout)");
-    int pos = dirx.search(input);
+    int pos = dirx.indexIn(input);
     if (pos == -1)
         return 0;
     const QString& dirStr = dirx.capturedTexts().first();
@@ -456,7 +456,7 @@
     QString name = a.left(colonPos).trimmed();
     if (vis) {
         QRegExp mnemonicVis("^([\\+\\#\\-\\~] *)");
-        int pos = mnemonicVis.search(name);
+        int pos = mnemonicVis.indexIn(name);
         if (pos == -1) {
             *vis = Uml::Visibility::Private;  // default value
         } else {
@@ -521,14 +521,14 @@
          * using narrative names, for example "check water temperature".
          */
         QRegExp beginningUpToOpenParenth( "^([^\\(]+)" );
-        int pos = beginningUpToOpenParenth.search(m);
+        int pos = beginningUpToOpenParenth.indexIn(m);
         if (pos == -1)
             return PS_Illegal_MethodName;
         desc.m_name = beginningUpToOpenParenth.cap(1);
     }
     desc.m_pReturnType = NULL;
     QRegExp pat = QRegExp("\\) *:(.*)$");
-    int pos = pat.search(m);
+    int pos = pat.indexIn(m);
     if (pos != -1) {  // return type is optional
         QString retType = pat.cap(1);
         retType = retType.trimmed();
@@ -546,7 +546,7 @@
     m.remove( QRegExp("\\s*\\(\\s*\\)") );
     desc.m_args.clear();
     pat = QRegExp( "\\((.*)\\)" );
-    pos = pat.search(m);
+    pos = pat.indexIn(m);
     if (pos == -1)  // argument list is optional
         return PS_OK;
     QString arglist = pat.cap(1);
--- trunk/KDE/kdesdk/umbrello/umbrello/objectwidget.h #724917:724918
@@ -132,7 +132,7 @@
     /**
      * Overrides the standard operation.
      */
-    virtual void moveEvent(QMoveEvent */*m*/);
+    virtual void moveEvent(QMoveEvent *m);
 
     /**
      * Used to cleanup any other widget it may need to delete.
--- trunk/KDE/kdesdk/umbrello/umbrello/ownedcodeblock.cpp #724917:724918
@@ -35,8 +35,9 @@
 //
 
 OwnedCodeBlock::OwnedCodeBlock ( UMLObject * parent )
-        : QObject ( (QObject*)parent, "anOwnedCodeBlock" )
+        : QObject ( parent )
 {
+    setObjectName( "anOwnedCodeBlock" );
     initFields(parent);
 }
 
--- trunk/KDE/kdesdk/umbrello/umbrello/pluginloader.cpp #724917:724918
@@ -164,12 +164,12 @@
 
     PluginMap::iterator end(_plugins.end());
     for(PluginMap::iterator i = _plugins.begin(); i != end; ++i) {
-        Plugin *p = i.data();
+        Plugin *p = i.value();
         if(p == plugin) {
             kDebug() << "unloading plugin " << i.key();
 
             // remove it from the mapping
-            _plugins.remove(i);
+            _plugins.erase(i);
             break;
         }
     }
--- trunk/KDE/kdesdk/umbrello/umbrello/statewidget.cpp #724917:724918
@@ -189,10 +189,8 @@
 }
 
 bool StateWidget::removeActivity( const QString &activity ) {
-    int index = - 1;
-    if( ( index = m_Activities.findIndex( activity ) ) == -1 )
+    if( m_Activities.removeAll( activity ) == 0 )
         return false;
-    m_Activities.removeAll( m_Activities.at( index ) );
     updateComponentSize();
     return true;
 }
--- trunk/KDE/kdesdk/umbrello/umbrello/uml.cpp #724917:724918
@@ -612,7 +612,8 @@
     m_documentationDock->setObjectName("DocumentationDock");
 
     addDockWidget(Qt::LeftDockWidgetArea, m_documentationDock);
-    m_pDocWindow = new DocWindow(m_doc, m_documentationDock, "DOCWINDOW");
+    m_pDocWindow = new DocWindow(m_doc, m_documentationDock);
+    m_pDocWindow->setObjectName("DOCWINDOW");
     m_documentationDock->setWidget(m_pDocWindow);
 
     m_doc->setupSignals();//make sure gets signal from list view
--- trunk/KDE/kdesdk/umbrello/umbrello/umlviewimageexporter.cpp #724917:724918
@@ -96,7 +96,7 @@
 
     // check if the extension is the extension of the mime type
     QFileInfo info(m_imageURL.fileName());
-    QString ext = info.extension(false);
+    QString ext = info.suffix();
     QString extDef = UMLViewImageExporterModel::mimeTypeToImageType(m_imageMimeType);
     if(ext != extDef) {
         m_imageURL.setFileName(m_imageURL.fileName() + '.' + extDef);




More information about the umbrello-devel mailing list