[Uml-devel] branches/work/soc-umbrello

Gopala Krishna A krishna.ggk at gmail.com
Mon Mar 23 09:28:46 UTC 2009


SVN commit 943053 by gopala:

Merged revisions 918579,919271 via svnmerge from 
svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdesdk/umbrello

........
  r918579 | fischer | 2009-01-30 14:47:52 +0530 (Fri, 30 Jan 2009) | 1 line
  
  Fixing some Krazy issues.
........
  r919271 | fischer | 2009-01-31 22:08:11 +0530 (Sat, 31 Jan 2009) | 1 line
  
  Moving some documentation as it was done in the soc branche to reduce the differences to the branche.
........


 _M            . (directory)  
 M  +5 -6      umbrello/codeimport/classimport.cpp  
 M  +1 -1      umbrello/codeimport/import_utils.cpp  
 M  +5 -5      umbrello/codeimport/kdevcppparser/preprocesslexer.cpp  
 M  +1 -1      umbrello/codeimport/kdevcppparser/urlutil.cpp  
 M  +4 -4      umbrello/model_utils.cpp  
 M  +2 -2      umbrello/operation.cpp  
 M  +2 -2      umbrello/petaltree2uml.cpp  
 M  +2 -2      umbrello/umldoc.cpp  


** branches/work/soc-umbrello #property svnmerge-integrated
   - /trunk/KDE/kdesdk/umbrello:1-854015,854687,854787,855207-866962,866965-870129,871091,872169-887978,889968-889981,890075-890805,896752-896872,901256-910119,911086,911706-911805,912902,913652,916104,916343,916990-917128,917351
   + /trunk/KDE/kdesdk/umbrello:1-854015,854687,854787,855207-866962,866965-870129,871091,872169-887978,889968-889981,890075-890805,896752-896872,901256-910119,911086,911706-911805,912902,913652,916104,916343,916990-917128,917351,918579-919271
--- branches/work/soc-umbrello/umbrello/codeimport/classimport.cpp #943052:943053
@@ -1,11 +1,10 @@
 /***************************************************************************
- *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *  copyright (C) 2006-2008                                                *
+ *  copyright (C) 2006-2009                                                *
  *  Umbrello UML Modeller Authors <uml-devel at uml.sf.net>                   *
  ***************************************************************************/
 
@@ -55,15 +54,15 @@
 ClassImport *ClassImport::createImporterByFileExt(const QString &filename) 
 {
     ClassImport *classImporter;
-    if (filename.endsWith(".idl"))
+    if (filename.endsWith(QLatin1String(".idl")))
         classImporter = new IDLImport();
-    else if (filename.endsWith(".py"))
+    else if (filename.endsWith(QLatin1String(".py")))
         classImporter = new PythonImport();
-    else if (filename.endsWith(".java"))
+    else if (filename.endsWith(QLatin1String(".java")))
         classImporter = new JavaImport();
     else if (filename.contains( QRegExp("\\.ad[sba]$") ))
         classImporter = new AdaImport();
-    else if (filename.endsWith(".pas"))
+    else if (filename.endsWith(QLatin1String(".pas")))
         classImporter = new PascalImport();
 #ifndef DISABLE_CPP_IMPORT
     else
--- branches/work/soc-umbrello/umbrello/codeimport/import_utils.cpp #943052:943053
@@ -120,7 +120,7 @@
     QStringList lines = comment.split('\n');
     QString& first = lines.first();
     QRegExp wordex("\\w");
-    if (first.startsWith("/*")) {
+    if (first.startsWith(QLatin1String("/*"))) {
         int wordpos = wordex.indexIn(first);
         if (wordpos != -1)
             first = first.mid(wordpos);  // remove comment start
--- branches/work/soc-umbrello/umbrello/codeimport/kdevcppparser/preprocesslexer.cpp #943052:943053
@@ -547,15 +547,15 @@
                     m_preprocessedString += QString(" ") + (*pos).second + QString(" ");
                 }
             } else if (/*qt_rx.exactMatch(ide) ||*/
-                ide.endsWith("EXPORT") ||
-                (ide.startsWith("Q_EXPORT") && ide != "Q_EXPORT_INTERFACE") ||
-                ide.startsWith("QM_EXPORT") ||
-                ide.startsWith("QM_TEMPLATE")) {
+                ide.endsWith(QLatin1String("EXPORT")) ||
+                (ide.startsWith(QLatin1String("Q_EXPORT")) && ide != "Q_EXPORT_INTERFACE") ||
+                ide.startsWith(QLatin1String("QM_EXPORT")) ||
+                ide.startsWith(QLatin1String("QM_TEMPLATE"))) {
 
                 m_source.parse(*gr_whiteSpace);
                 if (m_source.currentChar() == '(')
                     skip('(', ')');
-            } else if (ide.startsWith("K_TYPELIST_") || ide.startsWith("TYPELIST_")) {
+            } else if (ide.startsWith(QLatin1String("K_TYPELIST_")) || ide.startsWith(QLatin1String("TYPELIST_"))) {
                 tk = m_source.createToken(Token_identifier, start);
                 m_source.parse(*gr_whiteSpace);
                 if (m_source.currentChar() == '(')
--- branches/work/soc-umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp #943052:943053
@@ -121,7 +121,7 @@
     if (absRef == absBase)
         return QString(".");
     else
-        return absRef.replace(0, absBase.length(), QString());
+        return absRef.remove(0, absBase.length());
 }
 
 ///////////////////////////////////////////////////////////////////////////////
--- branches/work/soc-umbrello/umbrello/model_utils.cpp #943052:943053
@@ -4,7 +4,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *  copyright (C) 2004-2008                                                *
+ *  copyright (C) 2004-2009                                                *
  *  Umbrello UML Modeller Authors <uml-devel at uml.sf.net>                   *
  ***************************************************************************/
 
@@ -579,13 +579,13 @@
         name.remove(mnemonicVis);
     }
     Uml::Parameter_Direction pd = Uml::pd_In;
-    if (name.startsWith("in ")) {
+    if (name.startsWith(QLatin1String("in "))) {
         pd = Uml::pd_In;
         name = name.mid(3);
-    } else if (name.startsWith("inout ")) {
+    } else if (name.startsWith(QLatin1String("inout "))) {
         pd = Uml::pd_InOut;
         name = name.mid(6);
-    } else if (name.startsWith("out ")) {
+    } else if (name.startsWith(QLatin1String("out "))) {
         pd = Uml::pd_Out;
         name = name.mid(4);
     }
--- branches/work/soc-umbrello/umbrello/operation.cpp #943052:943053
@@ -4,7 +4,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   copyright (C) 2002-2008                                               *
+ *   copyright (C) 2002-2009                                               *
  *   Umbrello UML Modeller Authors <uml-devel at uml.sf.net>                  *
  ***************************************************************************/
 
@@ -197,7 +197,7 @@
     if (returnType.length() > 0 && returnType != "void") {
         s.append(" : ");
 
-        if (returnType.startsWith("virtual ")) {
+        if (returnType.startsWith(QLatin1String("virtual "))) {
             s += returnType.mid(8);
         } else {
             s += returnType;
--- branches/work/soc-umbrello/umbrello/petaltree2uml.cpp #943052:943053
@@ -4,7 +4,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   copyright (C) 2006-2008                                               *
+ *   copyright (C) 2006-2009                                               *
  *   Umbrello UML Modeller Authors <uml-devel at uml.sf.net>                  *
  ***************************************************************************/
 
@@ -423,7 +423,7 @@
             QStringList initialArgs = roleNode->initialArgs();
             if (initialArgs.count() > 1) {
                 QString roleName = clean(initialArgs[1]);
-                if (! roleName.startsWith("$UNNAMED"))
+                if (! roleName.startsWith(QLatin1String("$UNNAMED")))
                     role->setName(roleName);
             }
             role->setID(quid(roleNode));
--- branches/work/soc-umbrello/umbrello/umldoc.cpp #943052:943053
@@ -4,7 +4,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *  copyright (C) 2002-2008                                                *
+ *  copyright (C) 2002-2009                                                *
  *  Umbrello UML Modeller Authors <uml-devel at uml.sf.net>                   *
  ***************************************************************************/
 
@@ -526,7 +526,7 @@
             newDocument();
             return false;
         }
-        if (filetype.endsWith(".mdl"))
+        if (filetype.endsWith(QLatin1String(".mdl")))
             status = Import_Rose::loadFromMDL(file);
         else
             status = loadFromXMI( file, ENC_UNKNOWN );




More information about the umbrello-devel mailing list