[Uml-devel] branches/work/soc-umbrello/umbrello (silent)

[Gopala Krishna A]

SVN commit 918755 by gopala:

SVN_SILENT: Fixed compilation errors resulted due to previous merge commit.



 M  +7 -5      CMakeLists.txt  
 M  +2 -2      controller/floatingtextwidgetcontroller.cpp  
 M  +8 -5      controller/messagewidgetcontroller.cpp  
 M  +4 -4      controller/objectwidgetcontroller.cpp  


--- branches/work/soc-umbrello/umbrello/CMakeLists.txt #918754:918755
@@ -315,6 +315,7 @@
     widgets/forkjoinwidget.cpp
     widgets/linkwidget.cpp
     widgets/messagewidget.cpp
+    widgets/newassociationwidget.cpp
     widgets/nodewidget.cpp
     widgets/notewidget.cpp
     widgets/objectnodewidget.cpp
@@ -336,11 +337,11 @@
 )
 
 set (libcontroller_SRCS
-    controller/floatingtextwidgetcontroller.cpp
-    controller/messagewidgetcontroller.cpp
-    controller/notewidgetcontroller.cpp
-    controller/objectwidgetcontroller.cpp
-    controller/umlwidgetcontroller.cpp
+#    controller/floatingtextwidgetcontroller.cpp
+#    controller/messagewidgetcontroller.cpp
+#    controller/notewidgetcontroller.cpp
+#    controller/objectwidgetcontroller.cpp
+#    controller/umlwidgetcontroller.cpp
 )
 
 ########### next target ###############
@@ -367,6 +368,7 @@
     enum.cpp
     enumliteral.cpp
     folder.cpp
+    foreignkeyconstraint.cpp
     icon_utils.cpp
     import_rose.cpp
     kplayerslideraction.cpp
--- branches/work/soc-umbrello/umbrello/controller/floatingtextwidgetcontroller.cpp #918754:918755
@@ -71,10 +71,10 @@
  * @param diffY The difference between current Y position and new Y position.
  */
 void FloatingTextWidgetController::moveWidgetBy(qreal diffX, qreal diffY) {
-    if (m_floatingTextWidget->m_Role == Uml::tr_Seq_Message_Self)
+    if (m_floatingTextWidget->textRole() == Uml::tr_Seq_Message_Self)
         return;
 
-    if (m_floatingTextWidget->m_Role == Uml::tr_Seq_Message
+    if (m_floatingTextWidget->textRole() == Uml::tr_Seq_Message
                     && ((MessageWidget*)m_floatingTextWidget->m_pLink)->isSelected()) {
         return;
     }
--- branches/work/soc-umbrello/umbrello/controller/messagewidgetcontroller.cpp #918754:918755
@@ -64,17 +64,19 @@
  * @param newH The new height for the widget.
  */
 void MessageWidgetController::resizeWidget(qreal newW, qreal newH) {
-    if (m_messageWidget->getSequenceMessageType() == Uml::sequence_message_creation)
-        m_messageWidget->setSize(m_messageWidget->getWidth(), newH);
+    // WE DONT USE controller in the current implementation
+#if 0
+    if (m_messageWidget->sequenceMessageType() == Uml::sequence_message_creation)
+        m_messageWidget->setSize(m_messageWidget->width(), newH);
     else {
-        qreal x1 = m_messageWidget->m_pOw[Uml::A]->getX();
+        qreal x1 = m_messageWidget->objectWidget(Uml::A)->x();
         qreal x2 = m_messageWidget->getxclicked();
         qreal diffX = 0;
         if (x1 < x2) {
-            diffX = x2 + (newW - m_messageWidget->getWidth());
+            diffX = x2 + (newW - m_messageWidget->width());
         }
         else {
-            diffX = x2 - (newW - m_messageWidget->getWidth());
+            diffX = x2 - (newW - m_messageWidget->width());
         }
         if (diffX <= 0 )
             diffX = 10;
@@ -84,6 +86,7 @@
 
     }
     emit m_messageWidget->sigMessageMoved();
+#endif
 }
 
 void MessageWidgetController::moveWidgetBy(qreal /*diffX*/, qreal diffY) {
--- branches/work/soc-umbrello/umbrello/controller/objectwidgetcontroller.cpp #918754:918755
@@ -51,7 +51,7 @@
 }
 
 void ObjectWidgetController::resizeWidget(qreal newW, qreal /*newH*/) {
-    m_widget->setSize(newW, m_widget->getHeight());
+    m_widget->setSize(newW, m_widget->height());
 }
 
 /**
@@ -60,12 +60,12 @@
 void ObjectWidgetController::mousePressEvent(QGraphicsSceneMouseEvent *me) {
     UMLWidgetController::mousePressEvent(me);
      isOnDestructionBox = false;
-    SeqLineWidget * pLine = dynamic_cast<ObjectWidget*>(m_widget)->getSeqLine();
+    SeqLineWidget * pLine = dynamic_cast<ObjectWidget*>(m_widget)->sequentialLine();
 
     if (pLine->onDestructionBox(pLine->mapFromScene(me->scenePos()))) {
         isOnDestructionBox = true;
-        m_oldX = dynamic_cast<ObjectWidget*>(m_widget)->getX() + dynamic_cast<ObjectWidget*>(m_widget)->getWidth() / 2;
-        m_oldY = dynamic_cast<ObjectWidget*>(m_widget)->getEndLineY() - 10;
+        m_oldX = dynamic_cast<ObjectWidget*>(m_widget)->getX() + dynamic_cast<ObjectWidget*>(m_widget)->width() / 2;
+        m_oldY = dynamic_cast<ObjectWidget*>(m_widget)->lineEndY() - 10;
     }
 
 }