[Uml-devel] kdesdk/umbrello/umbrello

[Oliver Kellogg]

CVS commit by okellogg: 

saveToXMI: Replaced XMI_NEST_PACKAGES by XMI_FLAT_PACKAGES.


  M +5 -6      umldoc.cpp   1.121


--- kdesdk/umbrello/umbrello/umldoc.cpp  #1.120:1.121
@@ -1388,5 +1388,5 @@ bool UMLDoc::saveToXMI(QIODevice& file) 
         QDomElement objectsElement = doc.createElement( "UML:Model" );
 
-#ifndef XMI_NEST_PACKAGES
+#ifdef XMI_FLAT_PACKAGES
         // Save packages first so that when loading they are known first.
         // This simplifies the establishing of cross reference links from
@@ -1407,13 +1407,12 @@ bool UMLDoc::saveToXMI(QIODevice& file) 
         for (UMLObject *o = objectList.first(); o; o = objectList.next() ) {
                 UMLObject_Type t = o->getBaseType();
-#if defined (XMI_NEST_PACKAGES)
-                // Under construction:
+#if defined (XMI_FLAT_PACKAGES)
+                if (t == ot_Package)
+                        continue;
+#else
                 // Objects contained in a package are already saved by
                 // UMLPackage::saveToXMI().
                 if (o->getUMLPackage())
                         continue;
-#else
-                if (t == ot_Package)
-                        continue;
 #endif
                 if (t == ot_Attribute || t == ot_Operation || t == ot_Association)