[Uml-devel] branches/KDE/3.5/kdesdk/umbrello/umbrello

[Oliver Kellogg]

SVN commit 444107 by okellogg:

Deprecate/remove Uml::lvt_Diagrams.

 M  +4 -11     umllistview.cpp  
 M  +1 -1      umlnamespace.h  


--- branches/KDE/3.5/kdesdk/umbrello/umbrello/umllistview.cpp #444106:444107
@@ -980,8 +980,6 @@
     deleteChildrenOf( componentView );
     deleteChildrenOf( deploymentView );
     deleteChildrenOf( entityRelationshipModel );
-    //Uncomment for using Luis diagram display code
-    //	deleteChildrenOf( diagramFolder );
 
     m_rv->setOpen(true);
     m_ucv->setOpen(true);
@@ -2563,8 +2561,6 @@
     	deleteChildrenOf( m_lv );
     	deleteChildrenOf( componentView );
     	deleteChildrenOf( deploymentView );
-    //Uncomment for using Luis diagram display code
-    //	deleteChildrenOf( diagramFolder );
      */
     QDomNode node = element.firstChild();
     QDomElement domElement = node.toElement();
@@ -2631,8 +2627,7 @@
             if (pObject && label.isEmpty())
                 label = pObject->getName();
 
-        } else if (typeIsFolder(lvType) ||
-                   lvType == Uml::lvt_Diagrams) {
+        } else if (typeIsFolder(lvType)) {
             // Pre-1.2 format: Folders did not have their ID set.
             // Pull a new ID now.
             nID = m_doc->getUniqueID();
@@ -2708,8 +2703,10 @@
                 << lvType << ") does not yet exist..."
                 << endl;
                 UMLObject* umlObject = parent->getUMLObject();
-                if (!umlObject)
+                if (!umlObject) {
+                    kdDebug() << "And also the parent->getUMLObject() does not exist" << endl;
                     return false;
+                }
                 if (nID == Uml::id_None) {
                     kdWarning() << "UMLListView::loadChildrenFromXMI: lvtype " << lvType
                     << " has id -1" << endl;
@@ -2751,10 +2748,6 @@
         case Uml::lvt_EntityRelationship_Model:
             item = entityRelationshipModel;
             break;
-        case Uml::lvt_Diagrams:
-            //Uncomment for using Luis diagram display code
-            //				item = diagramFolder;
-            break;
         default:
             {
                 Settings::OptionState optionState = UMLApp::app()->getOptionState();
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/umlnamespace.h #444106:444107
@@ -169,7 +169,7 @@
     lvt_Component_Folder,
     lvt_Component_View,
     lvt_Component,
-    lvt_Diagrams,
+    lvt_Diagrams,  // currently unused
     lvt_Artifact,
     lvt_Deployment_Diagram,
     lvt_Deployment_Folder,