Andi Fischer | 1 Oct 12:11 2008
Picon

KDE/kdesdk/umbrello/umbrello

SVN commit 866559 by fischer:

Krazy: fixing postfix usage of ++ and --.

 M  +5 -4      association.cpp  
 M  +2 -2      import_rose.cpp  
 M  +6 -6      petaltree2uml.cpp  
 M  +3 -3      umlviewimageexportermodel.cpp  

--- trunk/KDE/kdesdk/umbrello/umbrello/association.cpp #866558:866559
 <at>  <at>  -226,7 +226,7  <at>  <at> 
         m_AssocType == Uml::at_Child2Category ||
         m_AssocType == Uml::at_Category2Parent
         ) {
-        for (unsigned r = Uml::A; r <= Uml::B; r++) {
+        for (unsigned r = Uml::A; r <= Uml::B; ++r) {
             const QString fetch = (m_AssocType == Uml::at_Generalization ?
                                    r == Uml::A ? "child" : "parent"
                        : r == Uml::A ? "client" : "supplier");
 <at>  <at>  -404,7 +404,7  <at>  <at> 
         };

         unsigned index;
-        for (index = 0; index < nAssocTypes; index++)
+        for (index = 0; index < nAssocTypes; ++index)
             if (assocTypeStr == assocTypeString[index])
                 break;
         if (index < nAssocTypes)
 <at>  <at>  -499,10 +499,11  <at>  <at> 
 }
(Continue reading)

Andi Fischer | 1 Oct 12:12 2008
Picon

branches/work/soc-umbrello/umbrello

SVN commit 866560 by fischer:

Porting r866559.

 M  +5 -4      association.cpp  
 M  +2 -2      import_rose.cpp  
 M  +6 -6      petaltree2uml.cpp  
 M  +3 -3      umlviewimageexportermodel.cpp  

--- branches/work/soc-umbrello/umbrello/association.cpp #866559:866560
 <at>  <at>  -260,7 +260,7  <at>  <at> 
         m_AssocType == Uml::at_Child2Category ||
         m_AssocType == Uml::at_Category2Parent
         ) {
-        for (unsigned r = Uml::A; r <= Uml::B; r++) {
+        for (unsigned r = Uml::A; r <= Uml::B; ++r) {
             const QString fetch = (m_AssocType == Uml::at_Generalization ?
                                    r == Uml::A ? "child" : "parent"
                        : r == Uml::A ? "client" : "supplier");
 <at>  <at>  -438,7 +438,7  <at>  <at> 
         };

         unsigned index;
-        for (index = 0; index < nAssocTypes; index++)
+        for (index = 0; index < nAssocTypes; ++index)
             if (assocTypeStr == assocTypeString[index])
                 break;
         if (index < nAssocTypes)
 <at>  <at>  -544,10 +544,11  <at>  <at> 
 }
(Continue reading)

Andi Fischer | 1 Oct 13:18 2008
Picon

KDE/kdesdk/umbrello/umbrello

SVN commit 866575 by fischer:

Krazy: fixing postfix usage of ++ and --.

 M  +20 -15    umldoc.cpp  

--- trunk/KDE/kdesdk/umbrello/umbrello/umldoc.cpp #866574:866575
 <at>  <at>  -113,7 +113,7  <at>  <at> 
         i18n("Deployment View"),
         i18n("Entity Relationship Model")
     };
-    for (int i = 0; i < Uml::N_MODELTYPES; i++) {
+    for (int i = 0; i < Uml::N_MODELTYPES; ++i) {
         m_root[i] = new UMLFolder(nativeRootName[i], STR2ID(nativeRootName[i]));
         m_root[i]->setLocalName(localizedRootName[i]);
     }
 <at>  <at>  -292,8 +292,9  <at>  <at> 
         // Remove all objects from the predefined folders.
         //  <at> fixme With advanced code generation enabled, this crashes.

-        for (int i = 0; i < Uml::N_MODELTYPES; i++)
+        for (int i = 0; i < Uml::N_MODELTYPES; ++i) {
             m_root[i]->removeAllObjects();
+        }
         // Restore the datatype folder, it has been deleted above.
         m_datatypeRoot = new UMLFolder("Datatypes", "Datatypes");
         m_datatypeRoot->setLocalName(i18n("Datatypes"));
 <at>  <at>  -680,7 +681,7  <at>  <at> 
 UMLView * UMLDoc::findView(Uml::IDType id)
 {
(Continue reading)

Andi Fischer | 1 Oct 13:18 2008
Picon

branches/work/soc-umbrello/umbrello

SVN commit 866576 by fischer:

Porting r866575.

 M  +20 -15    umldoc.cpp  

--- branches/work/soc-umbrello/umbrello/umldoc.cpp #866575:866576
 <at>  <at>  -118,7 +118,7  <at>  <at> 
         i18n("Deployment View"),
         i18n("Entity Relationship Model")
     };
-    for (int i = 0; i < Uml::N_MODELTYPES; i++) {
+    for (int i = 0; i < Uml::N_MODELTYPES; ++i) {
         m_root[i] = new UMLFolder(nativeRootName[i], STR2ID(nativeRootName[i]));
         m_root[i]->setLocalName(localizedRootName[i]);
     }
 <at>  <at>  -324,8 +324,9  <at>  <at> 
         // Remove all objects from the predefined folders.
         //  <at> fixme With advanced code generation enabled, this crashes.

-        for (int i = 0; i < Uml::N_MODELTYPES; i++)
+        for (int i = 0; i < Uml::N_MODELTYPES; ++i) {
             m_root[i]->removeAllObjects();
+        }
         // Restore the datatype folder, it has been deleted above.
         m_datatypeRoot = new UMLFolder("Datatypes", "Datatypes");
         m_datatypeRoot->setLocalName(i18n("Datatypes"));
 <at>  <at>  -735,7 +736,7  <at>  <at> 
 UMLView * UMLDoc::findView(Uml::IDType id)
 {
(Continue reading)

Gopala Krishna A | 1 Oct 19:29 2008
Picon

branches/work/soc-umbrello/umbrello

SVN commit 866695 by gopala:

Added Q_PROPERTY lines for some widgets (WidgetBase and UMLWidget
mainly) as a first step which eases undo/redo implementation.

 M  +6 -2      activitywidget.h  
 M  +2 -1      classifierwidget.h  
 M  +2 -0      enumwidget.h  
 M  +1 -0      forkjoinwidget.h  
 M  +1 -0      objectnodewidget.h  
 M  +4 -6      objectwidget.h  
 M  +10 -0     umlwidget.h  
 M  +9 -1      widgetbase.h  

--- branches/work/soc-umbrello/umbrello/activitywidget.h #866694:866695
 <at>  <at>  -31,7 +31,11  <at>  <at> 
  */
 class ActivityWidget : public UMLWidget
 {
-Q_OBJECT
+    Q_OBJECT
+    Q_ENUMS(ActivityType)
+    Q_PROPERTY(ActivityType activityType READ activityType WRITE setActivityType DESIGNABLE false)
+    Q_PROPERTY(QString preconditionText READ preconditionText WRITE setPreconditionText DESIGNABLE false)
+    Q_PROPERTY(QString postconditionText READ postconditionText WRITE setPostconditionText
DESIGNABLE false)

 public:
     enum ActivityType
 <at>  <at>  -89,7 +93,7  <at>  <at> 
(Continue reading)

Andi Fischer | 1 Oct 23:38 2008
Picon

KDE/kdesdk/umbrello/umbrello/codegenerators

SVN commit 866776 by fischer:

Krazy: fixing postfix usage of ++ and --.

 M  +3 -8      as/aswriter.cpp  
 M  +5 -5      cpp/cppwriter.cpp  
 M  +3 -2      csharp/csharpwriter.cpp  
 M  +4 -3      d/dwriter.cpp  
 M  +3 -3      idl/idlwriter.cpp  
 M  +1 -1      php/phpwriter.cpp  
 M  +1 -3      sql/sqlwriter.cpp  
 M  +4 -3      tcl/tclwriter.cpp  
 M  +2 -1      xml/xmlschemawriter.cpp  

--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/as/aswriter.cpp #866775:866776
 <at>  <at>  -1,16 +1,11  <at>  <at> 
 /***************************************************************************
-    begin                : Sat Feb 08 2003
-    copyright            : (C) 2003 by Alexander Blum
-    email                : blum <at> kewbee.de
- ***************************************************************************/
-
-/***************************************************************************
  *   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) 2004-2007                                               *
+ *   copyright (C) 2003      Alexander Blum <blum <at> kewbee.de>               *
(Continue reading)

Andi Fischer | 1 Oct 23:39 2008
Picon

KDE/kdesdk/umbrello/umbrello/codegenerators/php

SVN commit 866778 by fischer:

Krazy: fixing postfix usage of ++ and --.

 M  +2 -1      php5writer.cpp  

--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/php/php5writer.cpp #866777:866778
 <at>  <at>  -3401,8 +3401,9  <at>  <at> 
     static QStringList keywords;

     if (keywords.isEmpty()) {
-        for (int i = 0; php5words[i]; i++)
+        for (int i = 0; php5words[i]; ++i) {
             keywords.append(php5words[i]);
+        }
     }

     return keywords;

Andi Fischer | 1 Oct 23:40 2008
Picon

branches/work/soc-umbrello/umbrello/codegenerators

SVN commit 866780 by fischer:

Porting r866776 and r866778.

 M  +3 -8      as/aswriter.cpp  
 M  +5 -5      cpp/cppwriter.cpp  
 M  +3 -2      csharp/csharpwriter.cpp  
 M  +4 -3      d/dwriter.cpp  
 M  +3 -3      idl/idlwriter.cpp  
 M  +2 -1      php/php5writer.cpp  
 M  +1 -1      php/phpwriter.cpp  
 M  +1 -3      sql/sqlwriter.cpp  
 M  +4 -3      tcl/tclwriter.cpp  
 M  +2 -1      xml/xmlschemawriter.cpp  

--- branches/work/soc-umbrello/umbrello/codegenerators/as/aswriter.cpp #866779:866780
 <at>  <at>  -1,16 +1,11  <at>  <at> 
 /***************************************************************************
-    begin                : Sat Feb 08 2003
-    copyright            : (C) 2003 by Alexander Blum
-    email                : blum <at> kewbee.de
- ***************************************************************************/
-
-/***************************************************************************
  *   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) 2004-2007                                               *
(Continue reading)

Andi Fischer | 2 Oct 15:56 2008
Picon

KDE/kdesdk/umbrello/umbrello/codegenerators

SVN commit 866962 by fischer:

Krazy: fixing postfix usage of ++ and --.

 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  

--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/codedocument.cpp #866961:866962
 <at>  <at>  -129,7 +129,7  <at>  <at> 

     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;
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/codegenerationpolicy.cpp #866961:866962
 <at>  <at>  -515,8 +515,9  <at>  <at> 
     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;
+    }

(Continue reading)

Andi Fischer | 2 Oct 15:56 2008
Picon

branches/work/soc-umbrello/umbrello/codegenerators

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
 <at>  <at>  -191,7 +191,7  <at>  <at> 

     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
 <at>  <at>  -568,8 +568,9  <at>  <at> 
     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;
+    }

(Continue reading)


Gmane