[Uml-devel] kdesdk/umbrello/umbrello

[Klas Kalass]

CVS commit by kalass: 

define static members


  M +6 -0      association.cpp   1.8
  M +4 -4      association.h   1.6
  M +3 -0      codegenerator.cpp   1.10


--- kdesdk/umbrello/umbrello/association.cpp  #1.7:1.8
@@ -13,4 +13,10 @@
 #include "umldoc.h"
 
+// static members
+const Uml::Association_Type UMLAssociation::atypeFirst = Uml::at_Generalization;
+const Uml::Association_Type UMLAssociation::atypeLast = Uml::at_Activity;
+const unsigned UMLAssociation::nAssocTypes = (unsigned)atypeLast - (unsigned)atypeFirst + 1;
+
+// constructor
 UMLAssociation::UMLAssociation(UMLDoc* parent) : UMLObject((UMLObject *)parent) {
         init();

--- kdesdk/umbrello/umbrello/association.h  #1.5:1.6
@@ -307,8 +307,8 @@ protected:
          * order of Uml::Association_Type.
          */
-        static const Uml::Association_Type atypeFirst = Uml::at_Generalization;
-        static const Uml::Association_Type atypeLast = Uml::at_Activity;
-        static const unsigned nAssocTypes = (unsigned)atypeLast - (unsigned)atypeFirst + 1;
-        static const QString assocTypeStr[nAssocTypes];
+        static const Uml::Association_Type atypeFirst;
+        static const Uml::Association_Type atypeLast;
+        static const unsigned nAssocTypes;
+        static const QString assocTypeStr[];
 
         Uml::Association_Type m_AssocType;

--- kdesdk/umbrello/umbrello/codegenerator.cpp  #1.9:1.10
@@ -41,5 +41,8 @@
 #define MAXLINES 100
 
+// static members
+KInstance* CodeGenerator::s_instance;
 
+// constructor
 CodeGenerator::CodeGenerator(QObject *parent, const char *name)
                 :QObject(parent, name) {