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

[Oliver Kellogg]

SVN commit 677223 by okellogg:

ActivityWidget::Activity_Type Fork_DEPRECATED was removed.

 M  +3 -3      assocrules.cpp  


--- branches/KDE/3.5/kdesdk/umbrello/umbrello/assocrules.cpp #677222:677223
@@ -203,11 +203,11 @@
             // no transitions to initial activity allowed
             if (actB && actB->getActivityType() == ActivityWidget::Initial)
                 return false;
-            // Fork_DEPRECATED here means "not applicable".
-            ActivityWidget::ActivityType actTypeA = ActivityWidget::Fork_DEPRECATED;
+            // actType -1 here means "not applicable".
+            int actTypeA = -1;
             if (actA)
                 actTypeA = actA->getActivityType();
-            ActivityWidget::ActivityType actTypeB = ActivityWidget::Fork_DEPRECATED;
+            int actTypeB = -1;
             if (actB)
                 actTypeB = actB->getActivityType();
             // only from a normal, branch or fork activity to the end