[Uml-devel] kdesdk/umbrello/umbrello

[Jonathan Riddell]

CVS commit by jriddell: 

Fix beastie 55238, remove implementation type associations
there's no such thing


  M +1 -0      association.cpp   1.4
  M +0 -4      umlview.cpp   1.26
  M +0 -3      worktoolbar.cpp   1.7
  M +0 -1      worktoolbar.h   1.5


--- kdesdk/umbrello/umbrello/association.cpp  #1.3:1.4
@@ -41,4 +41,5 @@ const QString UMLAssociation::assocTypeS
         "collmessageself",      // at_Coll_Message_Self
         "seqmessageself",       // at_Seq_Message_Self
+        /*implementation no longer exists, but we keep it for compatibility*/
         "implementation",       // at_Implementation
         "composition",          // at_Composition

--- kdesdk/umbrello/umbrello/umlview.cpp  #1.25:1.26
@@ -2034,8 +2034,4 @@ Uml::Association_Type UMLView::convert_T
                         break;
 
-                case WorkToolBar::tbb_Implementation:
-                        at = at_Implementation;
-                        break;
-
                 case WorkToolBar::tbb_Aggregation:
                         at = at_Aggregation;

--- kdesdk/umbrello/umbrello/worktoolbar.cpp  #1.6:1.7
@@ -97,7 +97,4 @@ void WorkToolBar::slotCheckToolBar(Uml::
                 setToggle( tbb_Composition, true );
 
-                insertButton( m_Pixmaps.Implementation, tbb_Implementation, true, i18n("Implementation"));
-                setToggle( tbb_Implementation, true );
-
                 insertButton( m_Pixmaps.Generalization, tbb_Generalization, true,
                               i18n("Implements (Generalisation/Realisation)"));

--- kdesdk/umbrello/umbrello/worktoolbar.h  #1.4:1.5
@@ -65,5 +65,4 @@ public:
             tbb_Coll_Message,
             tbb_Seq_Message,
-            tbb_Implementation,
             tbb_Composition,
             tbb_UniAssociation,