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

[Oliver Kellogg]

SVN commit 606002 by okellogg:

sync with branches/KDE/3.5

 M  +1 -1      codegenerators/idlwriter.cpp  
 M  +3 -3      codeimport/idlimport.cpp  
 M  +2 -2      codeimport/javaimport.cpp  
 M  +1 -1      codeimport/nativeimportbase.cpp  
 M  +4 -4      codeimport/pascalimport.cpp  
 M  +2 -2      codeimport/pythonimport.cpp  
 M  +2 -0      umlviewimageexporter.cpp  
 M  +2 -0      umlviewimageexportermodel.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/idlwriter.cpp #606001:606002
@@ -72,7 +72,7 @@
             // at the "wrong" side.
             // Returning roleName = QString::null tells caller to
             // skip this association at this side.
-            roleName.clear();
+            roleName = QString();
             return;
         }
         IAmRoleA = false;
--- trunk/KDE/kdesdk/umbrello/umbrello/codeimport/idlimport.cpp #606001:606002
@@ -74,7 +74,7 @@
         } else {
             if (!lexeme.isEmpty()) {
                 m_source.append(lexeme);
-                lexeme.clear();
+                lexeme = QString();
             }
             m_source.append(QString(c));
         }
@@ -129,7 +129,7 @@
         if (! parseStmt())
             skipStmt();
         m_currentAccess = Uml::Visibility::Public;
-        m_comment.clear();
+        m_comment = QString();
     }
     pclose(fp);
 }
@@ -157,7 +157,7 @@
         m_klass->setStereotype("CORBAInterface");
         m_klass->setAbstract(m_isAbstract);
         m_isAbstract = false;
-        m_comment.clear();
+        m_comment = QString();
         if (advance() == ";")   // forward declaration
             return true;
         if (m_source[m_srcIndex] == ":") {
--- trunk/KDE/kdesdk/umbrello/umbrello/codeimport/javaimport.cpp #606001:606002
@@ -72,7 +72,7 @@
         } else {
             if (!lexeme.isEmpty()) {
                 m_source.append(lexeme);
-                lexeme.clear();
+                lexeme = QString();
             }
             m_source.append(QString(c));
         }
@@ -436,7 +436,7 @@
         // Constructor.
         nextToken = name;
         name = typeName;
-        typeName.clear();
+        typeName = QString();
     } else {
         nextToken = advance();
     }
--- trunk/KDE/kdesdk/umbrello/umbrello/codeimport/nativeimportbase.cpp #606001:606002
@@ -66,7 +66,7 @@
             closing = ">";
             break;
         default:
-            kError() << "JavaImport::skipToClosing(" << opener
+            kError() << "NativeImportBase::skipToClosing(" << opener
                 << "): " << "illegal input character" << endl;
             return false;
     }
--- trunk/KDE/kdesdk/umbrello/umbrello/codeimport/pascalimport.cpp #606001:606002
@@ -51,7 +51,7 @@
         } else {
             if (!lexeme.isEmpty()) {
                 m_source.append(lexeme);
-                lexeme.clear();
+                lexeme = QString();
             }
             if (c == ':' && word[i + 1] == '=') {
                 m_source.append(":=");
@@ -111,7 +111,7 @@
                     // Save current m_source and m_srcIndex.
                     QStringList source(m_source);
                     uint srcIndex = m_srcIndex;
-                    m_source.clear();
+                    m_source = QString();
                     parseFile(filename);
                     // Restore m_source and m_srcIndex.
                     m_source = source;
@@ -325,14 +325,14 @@
             UMLObject *ns = Import_Utils::createUMLObject(Uml::ot_Class,
                             name, m_scope[m_scopeIndex], m_comment);
             m_klass = static_cast<UMLClassifier*>(ns);
-            m_comment.clear();
+            m_comment = QString();
             if (m_source[m_srcIndex + 1] == "(") {
                 advance();
                 do {
                     QString base = advance();
                     UMLObject *ns = Import_Utils::createUMLObject(Uml::ot_Class, base, NULL);
                     UMLClassifier *parent = static_cast<UMLClassifier*>(ns);
-                    m_comment.clear();
+                    m_comment = QString();
                     Import_Utils::createGeneralization(m_klass, parent);
                 } while (advance() == ",");
             }
--- trunk/KDE/kdesdk/umbrello/umbrello/codeimport/pythonimport.cpp #606001:606002
@@ -101,7 +101,7 @@
             if (!lexeme.isEmpty()) {
                 m_source.append(lexeme);
                 m_srcIndex++;
-                lexeme.clear();
+                lexeme = QString();
             }
             m_source.append(QString(c));
             m_srcIndex++;
@@ -137,7 +137,7 @@
         UMLObject *ns = Import_Utils::createUMLObject(Uml::ot_Class,
                         name, m_scope[m_scopeIndex], m_comment);
         m_scope[++m_scopeIndex] = m_klass = static_cast<UMLClassifier*>(ns);
-        m_comment.clear();
+        m_comment = QString();
         if (advance() == "(") {
             while (m_srcIndex < srcLength - 1 && advance() != ")") {
                 const QString& baseName = m_source[m_srcIndex];
--- trunk/KDE/kdesdk/umbrello/umbrello/umlviewimageexporter.cpp #606001:606002
@@ -5,6 +5,8 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
+ *   copyright (C) 2006                                                    *
+ *   Umbrello UML Modeller Authors <uml-devel at uml.sf.net>                  *
  ***************************************************************************/
 
 // include files for Qt
--- trunk/KDE/kdesdk/umbrello/umbrello/umlviewimageexportermodel.cpp #606001:606002
@@ -5,6 +5,8 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
+ *   copyright (C) 2006                                                    *
+ *   Umbrello UML Modeller Authors <uml-devel at uml.sf.net>                  *
  ***************************************************************************/
 
 #include <math.h>