Umbrello UML Modeller

SVN commit 866963 by fischer:

Porting r866962.

 M  +1 -1      codedocument.cpp  
 M  +2 -1      codegenerationpolicy.cpp  
 M  +1 -1      codegenerator.cpp  
 M  +2 -1      simplecodegenerator.cpp  
 M  +5 -3      textblock.cpp  


--- branches/work/soc-umbrello/umbrello/codegenerators/codedocument.cpp #866962:866963
@@ -191,7 +191,7 @@
 
     tag = tag + "_0";
     int number = m_lastTagIndex;
-    for ( ; findTextBlockByTag(tag, true); number++) {
+    for ( ; findTextBlockByTag(tag, true); ++number) {
         tag = prefix + '_' + QString::number(number);
     }
     m_lastTagIndex = number;
--- branches/work/soc-umbrello/umbrello/codegenerators/codegenerationpolicy.cpp #866962:866963
@@ -568,8 +568,9 @@
     QTextStream ts(&f);
     QString retstr;
     QString endLine = getNewLineEndingChars();
-    for(int l = 0; l < MAXLINES && !ts.atEnd(); l++)
+    for (int l = 0; l < MAXLINES && !ts.atEnd(); ++l) {
         retstr += ts.readLine()+endLine;
+    }
 
     //do variable substitution
     retstr.replace( QRegExp("%author%"),QString(qgetenv("USER")));  //get the user name from some where else
--- branches/work/soc-umbrello/umbrello/codegenerators/codegenerator.cpp #866962:866963
@@ -92,7 +92,7 @@
         QString prefix = "doc";
         QString id = prefix + "_0";
         int number = lastIDIndex;
-        for ( ; findCodeDocumentByID(id); number++) {
+        for ( ; findCodeDocumentByID(id); ++number) {
             id = prefix + '_' + QString::number(number);
         }
         lastIDIndex = number;
--- branches/work/soc-umbrello/umbrello/codegenerators/simplecodegenerator.cpp #866962:866963
@@ -59,8 +59,9 @@
 QString SimpleCodeGenerator::getIndent ()
 {
     QString myIndent;
-    for (int i = 0 ; i < m_indentLevel ; i++)
+    for (int i = 0 ; i < m_indentLevel; ++i) {
         myIndent.append(m_indentation);
+    }
     return myIndent;
 }
 
--- branches/work/soc-umbrello/umbrello/codegenerators/textblock.cpp #866962:866963
@@ -189,12 +189,14 @@
  */
 QString TextBlock::getIndentationString ( int level ) const
 {
-    if (!level)
+    if (!level) {
         level = m_indentationLevel;
+    }
     QString indentAmount = getIndentation();
     QString indentation;
-    for(int i=0; i<level; i++)
+    for (int i=0; i<level; ++i) {
         indentation.append(indentAmount);
+    }
     return indentation;
 }
 
@@ -291,7 +293,7 @@
         if (!text.contains(QRegExp(breakStr + "\\$")))
             matches++;
 
-        for (int i=0; i < matches; i++)
+        for (int i=0; i < matches; ++i)
         {
             QString line = text.section(QRegExp(breakStr),i,i);
             output += linePrefix + line;

SVN commit 917485 by fischer:

Remove some bad placed comment.

 M  +0 -6      codedocument.cpp  


--- branches/work/soc-umbrello/umbrello/codegenerators/codedocument.cpp #917484:917485
@@ -262,12 +262,6 @@
  */
 QString CodeDocument::cleanName ( const QString &name )
 {
-
-/**
- * A little utility method which calls CodeGenerator::cleanName.
- * @param name   the cleanable name
- * @return       the cleaned name
- */
     return CodeGenerator::cleanName(name);
 }

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()));

SVN commit 1241458 by fischer:

Not needed include removed.

 M  +0 -1      codegenerationpolicy.cpp  


--- branches/work/soc-umbrello/umbrello/codegenerators/codegenerationpolicy.cpp #1241457:1241458
@@ -21,7 +21,6 @@
 
 // kde includes
 #include <kconfig.h>
-#include <kdeversion.h>
 #include <kstandarddirs.h>
 
 // qt includes

SVN commit 1244466 by fischer:

Bug 279184 fixed.

 M  +6 -0      ownedcodeblock.cpp  
 M  +2 -11     ownedcodeblock.h  


--- branches/work/soc-umbrello/umbrello/codegenerators/ownedcodeblock.cpp #1244465:1244466
@@ -22,6 +22,9 @@
 #include "uml.h"
 #include "textblock.h"
 
+/**
+ * Constructor
+ */
 OwnedCodeBlock::OwnedCodeBlock ( UMLObject * parent )
     : QObject ( parent )
 {
@@ -29,6 +32,9 @@
     initFields(parent);
 }
 
+/**
+ * Empty Destructor
+ */
 OwnedCodeBlock::~OwnedCodeBlock ( )
 {
     /*
--- branches/work/soc-umbrello/umbrello/codegenerators/ownedcodeblock.h #1244465:1244466
@@ -5,7 +5,7 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  *   copyright (C) 2003      Brian Thomas <thomas@...>   *
- *   copyright (C) 2004-2008                                               *
+ *   copyright (C) 2004-2011                                               *
  *   Umbrello UML Modeller Authors <uml-devel@...>                  *
  ***************************************************************************/
 
@@ -23,19 +23,12 @@
  * Describes any codeblock which is 'owned' by a UMLobject of some sort and should
  * be in sync with that parent.
  */
-class OwnedCodeBlock : virtual public QObject
+class OwnedCodeBlock : public QObject
 {
     Q_OBJECT
 public:
 
-    /**
-     * Constructor
-     */
     OwnedCodeBlock ( UMLObject * parent );
-
-    /**
-     * Empty Destructor
-     */
     virtual ~OwnedCodeBlock ( );
 
     UMLObject * getParentObject ( );
@@ -47,9 +40,7 @@
     virtual void release ();
 
     virtual void setAttributesOnNode ( QDomDocument & doc, QDomElement & blockElement);
-
     virtual void setAttributesFromNode ( QDomElement & element);
-
     virtual void setAttributesFromObject (TextBlock * obj);
 
 private:

SVN commit 1257954 by fischer:

Debug output improved.

 M  +4 -3      codeblock.cpp  
 M  +2 -4      codeblock.h  
 M  +3 -3      codedocument.cpp  
 M  +2 -4      codedocument.h  
 M  +4 -3      textblock.cpp  
 M  +3 -5      textblock.h  


--- branches/work/soc-umbrello/umbrello/codegenerators/codeblock.cpp #1257953:1257954
@@ -12,6 +12,7 @@
 #include "codeblock.h"
 
 #include "codedocument.h"
+#include "debug_utils.h"
 
 #include <QtCore/QTextStream>
 
@@ -133,9 +134,9 @@
     }
 }
 
-QTextStream& operator<<(QTextStream& str, const CodeBlock& obj)
+QDebug operator<<(QDebug str, const CodeBlock& obj)
 {
-    str << "CodeBlock: " << CodeBlock::enumToString(obj.contentType())
+    str.nospace() << "CodeBlock: " << CodeBlock::enumToString(obj.contentType())
         << ", ..." << static_cast<TextBlock*>(const_cast<CodeBlock*>(&obj));
-    return str;
+    return str.space();
 }
--- branches/work/soc-umbrello/umbrello/codegenerators/codeblock.h #1257953:1257954
@@ -42,13 +42,13 @@
 
     virtual void setAttributesFromObject(TextBlock * obj);
 
+    friend QDebug operator<<(QDebug str, const CodeBlock& obj);
+
 protected:
 
     virtual void setAttributesOnNode(QDomDocument & doc, QDomElement & blockElement);
     virtual void setAttributesFromNode(QDomElement & element);
 
-    friend QTextStream& operator<<(QTextStream& str, const CodeBlock& obj);
-
 private:
 
     // specifies whether the content (text) of this object
@@ -57,6 +57,4 @@
 
 };
 
-QTextStream& operator<<(QTextStream& str, const CodeBlock& obj);
-
 #endif // CODEBLOCK_H
--- branches/work/soc-umbrello/umbrello/codegenerators/codedocument.cpp #1257953:1257954
@@ -519,9 +519,9 @@
     return NULL;
 }
 
-QTextStream& operator<<(QTextStream& os, const CodeDocument& obj)
+QDebug operator<<(QDebug os, const CodeDocument& obj)
 {
-    os << "CodeDocument: id=" << obj.getID()
+    os.nospace() << "CodeDocument: id=" << obj.getID()
        << " , file=" << obj.getFileName();  //:TODO: add all attributes
-    return os;
+    return os.space();
 }
--- branches/work/soc-umbrello/umbrello/codegenerators/codedocument.h #1257953:1257954
@@ -79,6 +79,8 @@
 
     virtual void updateContent();
 
+    friend QDebug operator<<(QDebug os, const CodeDocument& obj);
+
 protected:
 
     virtual void setAttributesOnNode ( QDomDocument & doc, QDomElement & blockElement);
@@ -99,8 +101,6 @@
 
     virtual TextBlock * findCodeClassFieldTextBlockByTag( const QString &tag );
 
-    friend QTextStream& operator<<(QTextStream& os, const CodeDocument& obj);
-
 private:
 
     int m_lastTagIndex;
@@ -120,6 +120,4 @@
 
 };
 
-QTextStream& operator<<(QTextStream& os, const CodeDocument& obj);
-
 #endif // CODEDOCUMENT_H
--- branches/work/soc-umbrello/umbrello/codegenerators/textblock.cpp #1257953:1257954
@@ -15,6 +15,7 @@
 // local includes
 #include "codedocument.h"
 #include "codegenerationpolicy.h"
+#include "debug_utils.h"
 #include "uml.h"
 
 // qt includes
@@ -415,13 +416,13 @@
 /**
  * Operator '<<' for TextBlock.
  */
-QTextStream& operator<<(QTextStream& os, const TextBlock& obj)
+QDebug operator<<(QDebug os, const TextBlock& obj)
 {
-    os << "TextBlock: tag=" << obj.getTag()
+    os.nospace() << "TextBlock: tag=" << obj.getTag()
        << ", writeOutText=" << (obj.getWriteOutText() ? "true" : "false")
        << ", canDelete=" << (obj.canDelete() ? "true" : "false")
        << ", indentationLevel=" << obj.getIndentationLevel()
        << ", parentDocument id=" << (obj.getParentDocument() ? obj.getParentDocument()->getID() : "null")
        << ", text=" << obj.getText();
-    return os;
+    return os.space();
 }
--- branches/work/soc-umbrello/umbrello/codegenerators/textblock.h #1257953:1257954
@@ -5,7 +5,7 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  *   copyright (C) 2003      Brian Thomas <thomas@...>   *
- *   copyright (C) 2004-2009                                               *
+ *   copyright (C) 2004-2011                                               *
  *   Umbrello UML Modeller Authors <uml-devel@...>                  *
  ***************************************************************************/
 
@@ -84,6 +84,8 @@
     virtual int firstEditableLine();
     virtual int lastEditableLine();
 
+    friend QDebug operator<<(QDebug os, const TextBlock& obj);
+
 protected:
 
     void setCanDelete(bool canDelete);
@@ -93,8 +95,6 @@
     virtual void setAttributesOnNode(QDomDocument & doc, QDomElement & blockElement);
     virtual void setAttributesFromNode(QDomElement & root);
 
-    friend QTextStream& operator<<(QTextStream& os, const TextBlock& obj);
-
 private:
 
     QString m_text;   //< The actual text of this code block.
@@ -106,6 +106,4 @@
 
 };
 
-QTextStream& operator<<(QTextStream& os, const TextBlock& obj);
-
 #endif // TEXTBLOCK_H