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

[Andi Fischer]

SVN commit 1234250 by fischer:

Applied commit 1234100 by mlaurent from trunk.

 M  +1 -1      d/dclassifiercodedocument.cpp  
 M  +1 -1      java/javaclassifiercodedocument.cpp  
 M  +1 -1      tcl/tclwriter.cpp  


--- branches/work/soc-umbrello/umbrello/codegenerators/d/dclassifiercodedocument.cpp #1234249:1234250
@@ -339,7 +339,7 @@
     //
     QString pkgs = getPackage();
     pkgs.replace(QRegExp("::"), ".");
-    QString packageText = getPackage().isEmpty() ? "" : "package "+pkgs+';'+endLine;
+    QString packageText = getPackage().isEmpty() ? "" : QString("package "+pkgs+';'+endLine);
     CodeBlockWithComments * pblock = addOrUpdateTaggedCodeBlockWithComments("packages", packageText, "", 0, false);
     if(packageText.isEmpty() && pblock->getContentType() == CodeBlock::AutoGenerated)
         pblock->setWriteOutText(false);
--- branches/work/soc-umbrello/umbrello/codegenerators/java/javaclassifiercodedocument.cpp #1234249:1234250
@@ -342,7 +342,7 @@
     //
     QString pkgs = getPackage();
     pkgs.replace(QRegExp("::"), ".");
-    QString packageText = getPackage().isEmpty() ? "" : "package "+pkgs+';'+endLine;
+    QString packageText = getPackage().isEmpty() ? "" : QString(QLatin1String("package ")+pkgs+QLatin1Char(';')+endLine);
     CodeBlockWithComments * pblock = addOrUpdateTaggedCodeBlockWithComments("packages", packageText, "", 0, false);
     if(packageText.isEmpty() && pblock->getContentType() == CodeBlock::AutoGenerated)
         pblock->setWriteOutText(false);
--- branches/work/soc-umbrello/umbrello/codegenerators/tcl/tclwriter.cpp #1234249:1234250
@@ -407,7 +407,7 @@
         myNs = "";
     }
     // if different package
-    if (("::"+myNs) != mNamespace) {
+    if (QString("::"+myNs) != mNamespace) {
         if (c->package().isEmpty()) {
             writeCode("source " + findFileName(c, ".tcl"));
             writeCode("namespace import ::" + cleanName(c->name()));