[Uml-devel] kdesdk/umbrello/umbrello

[Oliver Kellogg]

CVS commit by okellogg: 

UMLView::removeWidget() doesn't need the extra isMessage arg,
it can find out by using getBaseType(). Coincidentally, this fixes
deletion of a multiple selection of messages in the seq.diagram.


  M +1 -1      messagewidget.cpp   1.24
  M +3 -3      umlview.cpp   1.112
  M +1 -2      umlview.h   1.44


--- kdesdk/umbrello/umbrello/messagewidget.cpp  #1.23:1.24
@@ -250,5 +250,5 @@ void MessageWidget::slotMenuSelection(in
         if(sel == ListPopupMenu::mt_Delete) {
                 // This will clean up this widget and the text widget:
-                m_pView -> removeWidget(this, true);
+                m_pView -> removeWidget(this);
         } else
                 m_pFText -> slotMenuSelection(sel);

--- kdesdk/umbrello/umbrello/umlview.cpp  #1.111:1.112
@@ -851,5 +851,5 @@ AssociationWidget * UMLView::findAssocWi
 }
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-void UMLView::removeWidget(UMLWidget * o, bool isMessage /*=false*/) {
+void UMLView::removeWidget(UMLWidget * o) {
         if(!o)
                 return;
@@ -870,5 +870,5 @@ void UMLView::removeWidget(UMLWidget * o
         disconnect( this, SIGNAL( sigClearAllSelected() ), o, SLOT( slotClearAllSelected() ) );
         disconnect( this, SIGNAL(sigColorChanged(int)), o, SLOT(slotColorChanged(int)));
-        if (isMessage)
+        if (t == wt_Message)
                 m_MessageList.remove(static_cast<MessageWidget*>(o));
         else
@@ -1125,5 +1125,5 @@ void UMLView::deleteSelection()
                 if (cur_msgWgt->getSelected() == true)
                 {
-                        removeWidget(cur_msgWgt, true);  // Remove message - it is selected.
+                        removeWidget(cur_msgWgt);  // Remove message - it is selected.
                 }
         }

--- kdesdk/umbrello/umbrello/umlview.h  #1.43:1.44
@@ -399,7 +399,6 @@ public:
          *
          * @param o             The widget to remove.
-         * @param isMessage     Set to true when invoking on a MessageWidget.
          */
-        void removeWidget(UMLWidget * o, bool isMessage = false);
+        void removeWidget(UMLWidget * o);
 
         /**