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

[Oliver Kellogg]

SVN commit 511451 by okellogg:

the{UseCase,Component,Deployment}View(): New.
componentView: Rename to m_cmpv.
deploymentView: Rename to m_dplv.
goodName(), tidyChangeItem(): Unused and unimplemented, remove.


 M  +18 -18    umllistview.cpp  
 M  +8 -7      umllistview.h  


--- branches/KDE/3.5/kdesdk/umbrello/umbrello/umllistview.cpp #511450:511451
@@ -115,8 +115,8 @@
     m_rv =  new UMLListViewItem(this, i18n("Views"), Uml::lvt_View);
     m_ucv = new UMLListViewItem(m_rv, i18n("Use Case View"), Uml::lvt_UseCase_View);
     m_lv = new UMLListViewItem(m_rv, i18n("Logical View"), Uml::lvt_Logical_View);
-    componentView = new UMLListViewItem(m_rv, i18n("Component View"), Uml::lvt_Component_View);
-    deploymentView = new UMLListViewItem(m_rv, i18n("Deployment View"), Uml::lvt_Deployment_View);
+    m_cmpv = new UMLListViewItem(m_rv, i18n("Component View"), Uml::lvt_Component_View);
+    m_dplv = new UMLListViewItem(m_rv, i18n("Deployment View"), Uml::lvt_Deployment_View);
     entityRelationshipModel = new UMLListViewItem(m_rv, i18n("Entity Relationship Model"), Uml::lvt_EntityRelationship_Model);
     datatypeFolder = new UMLListViewItem(m_lv, i18n("Datatypes"), Uml::lvt_Datatype_Folder);
 
@@ -574,9 +574,9 @@
     } else if (v->getType() == Uml::dt_UseCase) {
         p = m_ucv;
     } else if (v->getType() == Uml::dt_Component) {
-        p = componentView;
+        p = m_cmpv;
     } else if (v->getType() == Uml::dt_Deployment) {
-        p = deploymentView;
+        p = m_dplv;
     } else if (v->getType() == Uml::dt_EntityRelationship) {
         p = entityRelationshipModel;
     } else {
@@ -643,13 +643,13 @@
         if (lvt == Uml::lvt_Component_Folder)
             parentItem = current;
         else
-            parentItem = componentView;
+            parentItem = m_cmpv;
         break;
     case Uml::ot_Node:
         if (lvt == Uml::lvt_Deployment_Folder) {
             parentItem = current;
         } else {
-            parentItem = deploymentView;
+            parentItem = m_dplv;
         }
         break;
     case Uml::ot_Entity:
@@ -986,9 +986,9 @@
     if (dType == Uml::dt_UseCase) {
         item = m_ucv;
     } else if (dType == Uml::dt_Component) {
-        item = componentView;
+        item = m_cmpv;
     } else if (dType == Uml::dt_Deployment) {
-        item = deploymentView;
+        item = m_dplv;
     } else if (dType == Uml::dt_EntityRelationship) {
         item = entityRelationshipModel;
     } else {
@@ -1044,16 +1044,16 @@
 void UMLListView::init() {
     deleteChildrenOf( m_ucv );
     deleteChildrenOf( m_lv );
-    deleteChildrenOf( componentView );
-    deleteChildrenOf( deploymentView );
+    deleteChildrenOf( m_cmpv );
+    deleteChildrenOf( m_dplv );
     deleteChildrenOf( entityRelationshipModel );
 
     m_rv->setOpen(true);
     m_ucv->setOpen(true);
     m_lv->setOpen(true);
     datatypeFolder->setOpen(false);
-    componentView->setOpen(true);
-    deploymentView->setOpen(true);
+    m_cmpv->setOpen(true);
+    m_dplv->setOpen(true);
     entityRelationshipModel->setOpen(true);
 
     //setup misc.
@@ -1553,11 +1553,11 @@
     case Uml::lvt_Component_Diagram:
     case Uml::lvt_Component:
     case Uml::lvt_Artifact:
-        parent = componentView;
+        parent = m_cmpv;
         break;
     case Uml::lvt_Deployment_Diagram:
     case Uml::lvt_Node:
-        parent = deploymentView;
+        parent = m_dplv;
         break;
     case Uml::lvt_EntityRelationship_Diagram:
     case Uml::lvt_Entity:
@@ -2634,8 +2634,8 @@
     /*
         deleteChildrenOf( m_ucv );
         deleteChildrenOf( m_lv );
-        deleteChildrenOf( componentView );
-        deleteChildrenOf( deploymentView );
+        deleteChildrenOf( m_cmpv );
+        deleteChildrenOf( m_dplv );
      */
     QDomNode node = element.firstChild();
     QDomElement domElement = node.toElement();
@@ -2817,10 +2817,10 @@
             item = m_ucv;
             break;
         case Uml::lvt_Component_View:
-            item = componentView;
+            item = m_cmpv;
             break;
         case Uml::lvt_Deployment_View:
-            item = deploymentView;
+            item = m_dplv;
             break;
         case Uml::lvt_EntityRelationship_Model:
             item = entityRelationshipModel;
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/umllistview.h #511450:511451
@@ -311,6 +311,9 @@
 
     UMLListViewItem *theRootView() { return m_rv; }
     UMLListViewItem *theLogicalView() { return m_lv; }
+    UMLListViewItem *theUseCaseView() { return m_ucv; }
+    UMLListViewItem *theComponentView() { return m_cmpv; }
+    UMLListViewItem *theDeploymentView() { return m_dplv; }
 
     void saveToXMI( QDomDocument & qDoc, QDomElement & qElement,
                     bool saveSubmodelFiles = false );
@@ -320,11 +323,11 @@
     bool loadChildrenFromXMI( UMLListViewItem * parent, QDomElement & element );
 
 protected:
-    UMLListViewItem* m_rv;//root view
-    UMLListViewItem* m_ucv;//use case view item
-    UMLListViewItem* m_lv;//logical view item
-    UMLListViewItem* componentView;//component view item
-    UMLListViewItem* deploymentView;//deployment view item
+    UMLListViewItem* m_rv;    // root view
+    UMLListViewItem* m_ucv;   // use case view item
+    UMLListViewItem* m_lv;    // logical view item
+    UMLListViewItem* m_cmpv;  // component view item
+    UMLListViewItem* m_dplv;  // deployment view item
     UMLListViewItem* entityRelationshipModel;//entity relationship view item
     UMLListViewItem* datatypeFolder;
     UMLListViewItem* diagramFolder;
@@ -388,10 +391,8 @@
     void contentsMousePressEvent(QMouseEvent *me);
     void contentsMouseDoubleClickEvent(QMouseEvent * me);
     void focusOutEvent ( QFocusEvent * fe);
-    bool goodName(QListViewItem *i);
     QDragObject* dragObject();
     void startDrag();
-    void tidyChangeItem();
     bool acceptDrag (QDropEvent* event) const;
     void keyPressEvent(QKeyEvent *);