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

[Oliver Kellogg]

SVN commit 663014 by okellogg:

Catch up with Sharan's fixes on trunk (commits 661183,661878,661956)

 M  +4 -3      umlview.cpp  
 M  +5 -0      worktoolbar.cpp  


--- branches/KDE/3.5/kdesdk/umbrello/umbrello/umlview.cpp #663013:663014
@@ -131,6 +131,9 @@
 
     // Initialize other data
     m_AssociationList.setAutoDelete( true );
+    m_WidgetList.setAutoDelete( true );
+    m_MessageList.setAutoDelete( true );
+
     //Setup up booleans
     m_bChildDisplayedDoc = false;
     m_bPaste = false;
@@ -694,7 +697,6 @@
         //make sure not in selected list
         m_SelectedList.remove(obj);
         m_MessageList.remove(obj);
-        delete obj;
     }
 }
 
@@ -1366,7 +1368,6 @@
             obj->setVisible(true);
         } else {
             m_WidgetList.remove(obj);
-            delete obj;
         }
     }//end while
 
@@ -1914,7 +1915,7 @@
             // Wow, all done. Great!
             return;
         }
-        m_AssociationList.remove(a);  // AutoDelete is true
+        removeAssoc(a);  // AutoDelete is true
         // It's okay to break out because there can only be a single
         // containing object.
         break;
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/worktoolbar.cpp #663013:663014
@@ -172,6 +172,11 @@
     ToolBar_Buttons tbb = (ToolBar_Buttons)b;
     if (tbb == tbb_Arrow && m_CurrentButtonID == tbb_Arrow) {
         toggleButton(tbb_Arrow);
+
+        // signal needed, in the case ( when switching diagrams ) that
+        // Arrow Button gets activated, but the toolBarState of the Views may be different
+        emit sigButtonChanged( m_CurrentButtonID );
+
         view->setCursor( currentCursor() );
         return;
     }