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

[Ralf Habacker]

SVN commit 1288032 by habacker:

Reduced differences to soc-umbrello branch.

 M  +2 -2      controller/objectwidgetcontroller.cpp  
 M  +2 -2      umlscene.cpp  
 M  +1 -1      widgets/objectwidget.cpp  
 M  +1 -1      widgets/objectwidget.h  


--- trunk/KDE/kdesdk/umbrello/umbrello/controller/objectwidgetcontroller.cpp #1288031:1288032
@@ -78,7 +78,7 @@
 {
     UMLWidgetController::mousePressEvent(me);
     m_isOnDestructionBox = false;
-    SeqLineWidget * pLine = dynamic_cast<ObjectWidget*>(m_widget)->getSeqLine();
+    SeqLineWidget * pLine = dynamic_cast<ObjectWidget*>(m_widget)->sequentialLine();
 
     if (pLine->onDestructionBox(me->pos())) {
         m_isOnDestructionBox = true;
@@ -138,7 +138,7 @@
 {
     // endLine = length of the life line + diffY - 10 to center on the destruction box
     int endLine = dynamic_cast<ObjectWidget *>(m_widget)->getEndLineY() + diffY - 10;
-    SeqLineWidget * pLine = dynamic_cast<ObjectWidget *>(m_widget)->getSeqLine();
+    SeqLineWidget * pLine = dynamic_cast<ObjectWidget *>(m_widget)->sequentialLine();
     pLine->setEndOfLine(endLine);
     m_oldY = endLine;
 }
--- trunk/KDE/kdesdk/umbrello/umbrello/umlscene.cpp #1288031:1288032
@@ -994,7 +994,7 @@
         ObjectWidget *ow = dynamic_cast<ObjectWidget*>(obj);
         if (ow == NULL)
             continue;
-        SeqLineWidget *pLine = ow->getSeqLine();
+        SeqLineWidget *pLine = ow->sequentialLine();
         if (pLine == NULL) {
             uError() << "SeqLineWidget of " << ow->name()
             << " (id=" << ID2STR(ow->localID()) << ") is NULL";
@@ -1019,7 +1019,7 @@
         ObjectWidget *ow = dynamic_cast<ObjectWidget*>(obj);
         if (ow == NULL)
             continue;
-        SeqLineWidget *pLine = ow->getSeqLine();
+        SeqLineWidget *pLine = ow->sequentialLine();
         if (pLine == NULL) {
             uError() << "SeqLineWidget of " << ow->name()
                      << " (id=" << ID2STR(ow->localID()) << ") is NULL";
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/objectwidget.cpp #1288031:1288032
@@ -383,7 +383,7 @@
     return false;
 }
 
-SeqLineWidget *ObjectWidget::getSeqLine()
+SeqLineWidget *ObjectWidget::sequentialLine()
 {
     return m_pLine;
 }
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/objectwidget.h #1288031:1288032
@@ -216,7 +216,7 @@
      * Returns a non NULL pointer if this ObjectWidget is part of a
      * sequence diagram.
      */
-    SeqLineWidget *getSeqLine();
+    SeqLineWidget *sequentialLine();
 
     /**
      * Saves to the "objectwidget" XMI element.