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

[Ralf Habacker]

SVN commit 1312613 by habacker:

Renamed MessageWidget::contains to hasObjectWidget to reduce differences to soc branch.

 M  +1 -1      umlscene.cpp  
 M  +1 -1      widgets/messagewidget.cpp  
 M  +1 -1      widgets/messagewidget.h  


--- trunk/KDE/kdesdk/umbrello/umbrello/umlscene.cpp #1312612:1312613
@@ -1077,7 +1077,7 @@
 
     MessageWidgetListIt it(m_MessageList);
     foreach(MessageWidget *obj , m_MessageList) {
-        if (! obj->contains(w)) {
+        if (! obj->hasObjectWidget(w)) {
             continue;
         }
         //make sure message doesn't have any associations
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/messagewidget.cpp #1312612:1312613
@@ -620,7 +620,7 @@
  * @param w The ObjectWidget to check for.
  * @return  true - if is contained, false - not contained.
  */
-bool MessageWidget::contains(ObjectWidget * w)
+bool MessageWidget::hasObjectWidget(ObjectWidget * w)
 {
     if(m_pOw[Uml::A] == w || m_pOw[Uml::B] == w)
         return true;
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/messagewidget.h #1312612:1312613
@@ -85,7 +85,7 @@
         return m_sequenceMessageType;
     }
 
-    bool contains(ObjectWidget * w);
+    bool hasObjectWidget(ObjectWidget * w);
 
     ObjectWidget* objectWidget(Uml::Role_Type role);
     void setObjectWidget(ObjectWidget * ow, Uml::Role_Type role) ;