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

[Andi Fischer]

SVN commit 974371 by fischer:

Krazy complaints [doublequote_chars] fixed.

 M  +4 -4      codegenerators/cpp/cppheadercodeaccessormethod.cpp  
 M  +2 -2      codegenerators/cpp/cppheadercodeoperation.cpp  
 M  +5 -5      codegenerators/cpp/cppsourcecodeaccessormethod.cpp  
 M  +4 -4      codegenerators/perl/perlwriter.cpp  
 M  +4 -4      codegenerators/xml/xmlschemawriter.cpp  
 M  +1 -1      codeimport/javaimport.cpp  
 M  +4 -4      codeimport/nativeimportbase.cpp  
 M  +1 -1      widgets/objectnodewidget.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/cpp/cppheadercodeaccessormethod.cpp #974370:974371
@@ -5,7 +5,7 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  *   copyright (C) 2003      Brian Thomas <thomas at mail630.gsfc.nasa.gov>   *
- *   copyright (C) 2004-2008                                               *
+ *   copyright (C) 2004-2009                                               *
  *   Umbrello UML Modeller Authors <uml-devel at uml.sf.net>                  *
  ***************************************************************************/
 
@@ -97,9 +97,9 @@
         objectType = fieldName;
 
     QString methodReturnType = "void";
-    QString methodName = ""; // "get"+cppdoc->capitalizeFirstLetter(fieldName);
-    QString methodParams = " "; // "get"+cppdoc->capitalizeFirstLetter(fieldName);
-    QString headerText = "";
+    QString methodName; // "get"+cppdoc->capitalizeFirstLetter(fieldName);
+    QString methodParams = QChar(' '); // "get"+cppdoc->capitalizeFirstLetter(fieldName);
+    QString headerText;
     QString endLine = UMLApp::app()->getCommonPolicy()->getNewLineEndingChars();
 
     switch(getType()) {
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/cpp/cppheadercodeoperation.cpp #974370:974371
@@ -5,7 +5,7 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  *   copyright (C) 2003      Brian Thomas <thomas at mail630.gsfc.nasa.gov>   *
- *   copyright (C) 2004-2008                                               *
+ *   copyright (C) 2004-2009                                               *
  *   Umbrello UML Modeller Authors <uml-devel at uml.sf.net>                  *
  ***************************************************************************/
 
@@ -142,7 +142,7 @@
        if (!pOp->isLifeOperation()) {
            prototype = "virtual " + prototype + " = 0";
            if (inlinePolicy) {
-               start = ";";
+               start = ';';
                end = "";
            }
        }
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/cpp/cppsourcecodeaccessormethod.cpp #974370:974371
@@ -5,7 +5,7 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  *   copyright (C) 2003      Brian Thomas <thomas at mail630.gsfc.nasa.gov>   *
- *   copyright (C) 2004-2008                                               *
+ *   copyright (C) 2004-2009                                               *
  *   Umbrello UML Modeller Authors <uml-devel at uml.sf.net>                  *
  ***************************************************************************/
 
@@ -95,10 +95,10 @@
     if(objectType.isEmpty())
         objectType = fieldName;
 
-    QString methodReturnType = "void";
-    QString methodName = ""; // "get"+cppdoc->capitalizeFirstLetter(fieldName);
-    QString methodParams = " "; // "get"+cppdoc->capitalizeFirstLetter(fieldName);
-    QString headerText = "";
+    QString methodReturnType("void");
+    QString methodName; // "get"+cppdoc->capitalizeFirstLetter(fieldName);
+    QString methodParams = QChar(' '); // "get"+cppdoc->capitalizeFirstLetter(fieldName);
+    QString headerText;
     QString className = CodeGenerator::cleanName(c->getName());
     QString endLine = UMLApp::app()->getCommonPolicy()->getNewLineEndingChars();
 
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/perl/perlwriter.cpp #974370:974371
@@ -5,7 +5,7 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  *   copyright (C) 2003      David Hugh-Jones  <hughjonesd at yahoo.co.uk>    *
- *   copyright (C) 2004-2008                                               *
+ *   copyright (C) 2004-2009                                               *
  *   Umbrello UML Modeller Authors <uml-devel at uml.sf.net>                  *
  ***************************************************************************/
 
@@ -44,9 +44,9 @@
   UMLPackageList includes;
   findObjectsRelated(c,includes);
 
-  QString AV = "@";
-  QString SV = "$";
-  QString HV = "%";
+  QString AV = QChar('@');
+  QString SV = QChar('$');
+  QString HV = QChar('%');
   foreach (UMLPackage* conc, includes ) {
     if (conc->getBaseType() == Uml::ot_Datatype)
         continue;
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/xml/xmlschemawriter.cpp #974370:974371
@@ -5,7 +5,7 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  *   copyright (C) 2003 Brian Thomas <brian.thomas at gsfc.nasa.gov>          *
- *   copyright (C) 2004-2008                                               *
+ *   copyright (C) 2004-2009                                               *
  *   Umbrello UML Modeller Authors <uml-devel at uml.sf.net>                  *
  ***************************************************************************/
 
@@ -628,14 +628,14 @@
     // Min/Max Occurs is based on whether it is this a single element
     // or a List (maxoccurs>1). One day this will be done correctly with special
     // multiplicity object that we don't have to figure out what it means via regex.
-    QString minOccurs = "0";
+    QString minOccurs = QChar('0');
     QString maxOccurs = "unbounded";
     if (multi.isEmpty())
     {
         // in this case, association will only specify ONE element can exist
         // as a child
-        minOccurs = "1";
-        maxOccurs = "1";
+        minOccurs = '1';
+        maxOccurs = '1';
     }
     else
     {
--- trunk/KDE/kdesdk/umbrello/umbrello/codeimport/javaimport.cpp #974370:974371
@@ -386,7 +386,7 @@
                 if (next == ";") {
                     // @todo handle methods in enum
                     // For now, we cheat (skip them)
-                    m_source[m_srcIndex] = "{";
+                    m_source[m_srcIndex] = '{';
                     if (! skipToClosing('{'))
                         return false;
                 }
--- trunk/KDE/kdesdk/umbrello/umbrello/codeimport/nativeimportbase.cpp #974370:974371
@@ -95,16 +95,16 @@
     QString closing;
     switch (opener.toLatin1()) {
         case '{':
-            closing = "}";
+            closing = '}';
             break;
         case '[':
-            closing = "]";
+            closing = ']';
             break;
         case '(':
-            closing = ")";
+            closing = ')';
             break;
         case '<':
-            closing = ">";
+            closing = '>';
             break;
         default:
             uError() << "opener='" << opener << "': illegal input character";
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/objectnodewidget.cpp #974370:974371
@@ -86,7 +86,7 @@
             QString objectflow_value;
             if(getState() == "-" || getState() == NULL)
             {
-                objectflow_value = " ";
+                objectflow_value = ' ';
             }
             else
             {