[Uml-devel] kdesdk/umbrello/umbrello

[Oliver Kellogg]

CVS commit by okellogg: 

ListPopupMenu::mt_Delete_Message: Remove.


  M +0 -1      associationwidget.cpp   1.123
  M +0 -22     floatingtext.cpp   1.59
  M +7 -8      listpopupmenu.h   1.33


--- kdesdk/umbrello/umbrello/associationwidget.cpp  #1.122:1.123
@@ -2102,5 +2102,4 @@ void AssociationWidget::slotMenuSelectio
 
         case ListPopupMenu::mt_Delete:
-        case ListPopupMenu::mt_Delete_Message:
                 m_pView->removeAssocInViewAndDoc(this);
                 break;

--- kdesdk/umbrello/umbrello/floatingtext.cpp  #1.58:1.59
@@ -88,26 +88,4 @@ void FloatingText::slotMenuSelection(int
                 break;
 
-        case ListPopupMenu::mt_Delete_Message:
-                // UNEXPECTED - should not be here
-                // Remove this branch when confident that it does not happen
-                kdDebug() << "FloatingText::slotMenuSelection(mt_Delete_Message)"
-                          << " is called" << endl;
-                if (m_pLink == NULL)
-                        return;
-                if (m_Role == Uml::tr_Seq_Message || m_Role == Uml::tr_Seq_Message_Self) {
-                        //here to delete this from a seq. diagram.
-                        kdDebug() << "  --- for Seq_Message." << endl;
-                        MessageWidget *m = static_cast<MessageWidget*>(m_pLink);
-                        m_pView->removeWidget( m );
-                } else {
-                        if (m_pView->getType() != Uml::dt_Collaboration)
-                                return;
-                        kdDebug() << "  --- for association." << endl;
-                        //here to delete assoc. on collab diagram.
-                        AssociationWidget *a = static_cast<AssociationWidget*>(m_pLink);
-                        m_pView->removeAssoc( a );
-                }
-                break;
-
         case ListPopupMenu::mt_Operation:
                 {

--- kdesdk/umbrello/umbrello/listpopupmenu.h  #1.32:1.33
@@ -120,5 +120,4 @@ public:
             mt_Undo,                            // 1981
             mt_Link_Docs,                     //LINKDOCS
-            mt_Delete_Message,                //DELETEMESSAGE
             mt_Show_Operation_Signature,      //SHOWOPSIG
             mt_Show_Operation_Signature_Selection, //SHOWOPSIG, multiple items
@@ -132,8 +131,8 @@ public:
             mt_Name,                          //Association name
             mt_FullAssociation,                 // Association with role names
-            mt_RoleNameA,                       // 1995
-            mt_RoleNameB,                       // 1996
+            mt_RoleNameA,                       // 1994
+            mt_RoleNameB,                       // 1995
             mt_Delete_Selection,              //DELETESELECTION
-            mt_Reset_Label_Positions,           // 1998
+            mt_Reset_Label_Positions,           // 1997
             mt_Line_Color,                    //LINECOLOR
             mt_Line_Color_Selection,          //LINECOLOR, multiple items
@@ -142,10 +141,10 @@ public:
             mt_Use_Fill_Color,                //USEFCOLOR
             mt_Default_Properties,            //DEFAULTPROPERTIES
-            mt_Rename_MultiA,                   // 2005
+            mt_Rename_MultiA,                   // 2004
             mt_Rename_MultiB,
             mt_Rename_Name,
             mt_Rename_RoleAName,
             mt_Rename_RoleBName,
-            mt_Change_Font,                     // 2010
+            mt_Change_Font,                     // 2009
             mt_Change_Font_Selection,
             mt_SnapToGrid,
@@ -155,10 +154,10 @@ public:
             mt_Up,
             mt_Down,
-            mt_Branch,                          // 2018
+            mt_Branch,                          // 2017
 
                 mt_Expand_All,                     //Expand all items in the list
                 mt_Collapse_All,                   //Collapse all items in the list
 
-                mt_Refactoring,                 // 2021
+                mt_Refactoring,                 // 2020
                 mt_ViewCode, // view code document contents
                 mt_Clone, // Create a deep copy of the object.