[Uml-devel] kdesdk/umbrello/umbrello

[Jonathan Riddell]

CVS commit by jriddell: 

replace getConcepts() with getClassesAndInterfaces() for codegeneration
to prevent it generating code for datatypes.


  M +1 -2      codegenerator.cpp   1.30
  M +1 -1      codegenerators/codewriter.cpp   1.4
  M +1 -1      codegenerators/cppcodegenerator.cpp   1.11
  M +1 -1      codegenerators/simplecodegenerator.cpp   1.8
  M +13 -13    codegenerators/xmlschemacodegenerator.cpp   1.8


--- kdesdk/umbrello/umbrello/codegenerator.cpp  #1.29:1.30
@@ -290,5 +289,5 @@ kdWarning()<<"INITTOPARENT called"<<endl
         // Walk through the document converting classifiers into
         // classifier code documents as needed (e.g only if doesnt exist)
-        UMLClassifierList concepts = getDocument()->getConcepts();
+        UMLClassifierList concepts = getDocument()->getClassesAndInterfaces();
         for (UMLClassifier *c = concepts.first(); c; c = concepts.next())
         {

--- kdesdk/umbrello/umbrello/codegenerators/codewriter.cpp  #1.3:1.4
@@ -370,5 +370,5 @@ void CodeWriter::generateAllClasses() {
         }
         m_fileMap->clear();
-        QPtrList<UMLClassifier> cList = m_doc->getConcepts();
+        QPtrList<UMLClassifier> cList = m_doc->getClassesAndInterfaces();
         generateCode(cList);
 }

--- kdesdk/umbrello/umbrello/codegenerators/cppcodegenerator.cpp  #1.10:1.11
@@ -194,5 +194,5 @@ kdDebug()<<" CPP INITTOPARENT called"<<e
         // Walk through the document converting classifiers into
         // classifier code documents as needed (e.g only if doesnt exist)
-        UMLClassifierList concepts = getDocument()->getConcepts();
+        UMLClassifierList concepts = getDocument()->getClassesAndInterfaces();
         for (UMLClassifier *c = concepts.first(); c; c = concepts.next())
         {

--- kdesdk/umbrello/umbrello/codegenerators/simplecodegenerator.cpp  #1.7:1.8
@@ -204,5 +204,5 @@ CodeDocument * SimpleCodeGenerator::newC
 void SimpleCodeGenerator::writeCodeToFile ( ) {
         m_fileMap->clear(); // yeah, need to do this, if not, just keep getting same damn directory to write to.
-        UMLClassifierList concepts = m_doc->getConcepts();
+        UMLClassifierList concepts = m_doc->getClassesAndInterfaces();
         for (UMLClassifier *c = concepts.first(); c; c = concepts.next())
                 this->writeClass(c); // call the writer for each class.

--- kdesdk/umbrello/umbrello/codegenerators/xmlschemacodegenerator.cpp  #1.7:1.8
@@ -84,5 +84,5 @@ void XMLSchemaCodeGenerator::initFromPar
         // Walk through the document converting classifiers into
         // classifier code documents as needed (e.g only if doesnt exist)
-        UMLClassifierList concepts = getDocument()->getConcepts();
+        UMLClassifierList concepts = getDocument()->getClassesAndInterfaces();
         for (UMLClassifier *c = concepts.first(); c; c = concepts.next())
         {