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

[Andi Fischer]

SVN commit 1270711 by fischer:

Various small changes applied. Mostly debug info added and white spaces adjusted.

 M  +2 -1      model_utils.cpp  
 M  +4 -1      umldoc.cpp  
 M  +0 -3      umllistview.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/model_utils.cpp #1270710:1270711
@@ -292,6 +292,7 @@
                             UMLObject::ObjectType type /* = ot_UMLObject */,
                             UMLObject *currentObj /*= 0*/)
 {
+    Q_UNUSED(currentObj);
     for (UMLObjectListIt oit(inList); oit.hasNext(); ) {
         UMLObject *obj = oit.next();
         if (obj->name() == name && type == obj->baseType())
@@ -402,7 +403,7 @@
         // and entity relationship)
         QString name;
         while (listView->rootView(listViewItem->type()) == NULL) {
-            name.insert(0, listViewItem->getText() + '/');
+            name.insert(0, listViewItem->text(0) + '/');
             listViewItem = static_cast<UMLListViewItem*>(listViewItem->parent());
             if (listViewItem == NULL)
                 break;
--- trunk/KDE/kdesdk/umbrello/umbrello/umldoc.cpp #1270710:1270711
@@ -83,6 +83,7 @@
  */
 UMLDoc::UMLDoc()
   : m_datatypeRoot(0),
+    m_stereoList(UMLStereotypeList()),
     m_Name(i18n("UML Model")),
     m_modelID("m1"),
     m_count(0),
@@ -156,7 +157,6 @@
 {
     delete m_datatypeRoot;
     delete m_pChangeLog;
-    m_pChangeLog = 0;
 }
 
 /**
@@ -176,6 +176,7 @@
         uError() << "view folder is not set";
         return;
     }
+    DEBUG(DBG_SRC) << "to folder " << *f;
     f->addView(view);
 
     UMLApp * pApp = UMLApp::app();
@@ -206,6 +207,7 @@
         uError() << "UMLDoc::removeView(UMLView *view) called with view = 0";
         return;
     }
+    DEBUG(DBG_SRC) << "<" << view->umlScene()->name() << ">";
     if ( UMLApp::app()->listView() ) {
         disconnect(this, SIGNAL(sigObjectRemoved(UMLObject*)),
                    view->umlScene(), SLOT(slotObjectRemoved(UMLObject*)));
@@ -1270,6 +1272,7 @@
  */
 UMLView* UMLDoc::createDiagram(UMLFolder *folder, Uml::DiagramType type, bool askForName /*= true */)
 {
+    DEBUG(DBG_SRC) << "folder=" << folder->name() << " / type=" << type.toString();
     bool ok = true;
     QString name,
     dname = uniqueViewName(type);
--- trunk/KDE/kdesdk/umbrello/umbrello/umllistview.cpp #1270710:1270711
@@ -1259,9 +1259,6 @@
 {
     if (!listViewItem)
         return 0;
-    // @TODO check this
-    //if (listViewItem->getType() == type && listViewItem->getID() == id)
-    //    return listViewItem;
 
     if (Model_Utils::typeIsFolder(listViewItem->type())) {
         for (int i=0; i < listViewItem->childCount(); i++) {