[Uml-devel] branches/work/soc-umbrello/umbrello/widgets

[Ralf Habacker]

SVN commit 1288342 by habacker:

Reduced differences to trunk.

 M  +1 -1      floatingtextwidget.cpp  
 M  +1 -1      linkwidget.cpp  
 M  +3 -3      linkwidget.h  


--- branches/work/soc-umbrello/umbrello/widgets/floatingtextwidget.cpp #1288341:1288342
@@ -17,13 +17,13 @@
 #include "classifier.h"
 #include "cmds.h"
 #include "debug_utils.h"
-#include "selectopdlg.h"
 #include "linkwidget.h"
 #include "listpopupmenu.h"
 #include "messagewidget.h"
 #include "model_utils.h"
 #include "object_factory.h"
 #include "operation.h"
+#include "selectopdlg.h"
 #include "textitem.h"
 #include "textitemgroup.h"
 #include "uml.h"
--- branches/work/soc-umbrello/umbrello/widgets/linkwidget.cpp #1288341:1288342
@@ -16,7 +16,7 @@
 #include "operation.h"
 #include "uml.h"
 #include "umlobject.h"
-#include "umlscene.h"
+#include "umlview.h"
 
 LinkWidget::LinkWidget()
 {
--- branches/work/soc-umbrello/umbrello/widgets/linkwidget.h #1288341:1288342
@@ -14,12 +14,12 @@
 #include <QtGui/QFont>
 
 #include "basictypes.h"
+#include "umlscene.h"
 
 // forward declarations
 class UMLClassifier;
 class UMLOperation;
 class FloatingTextWidget;
-class UMLScene;
 
 /**
  * This is an interface realized by AssociationWidget and MessageWidget.
@@ -99,8 +99,8 @@
      * Abstract operation implemented by inheriting classes.
      * Motivated by FloatingTextWidget::mouseMoveEvent()
      */
-    virtual void constrainTextPos(qreal &textX, qreal &textY,
-                                  qreal textWidth, qreal textHeight,
+    virtual void constrainTextPos(UMLSceneValue &textX, UMLSceneValue &textY,
+                                  UMLSceneValue textWidth, UMLSceneValue textHeight,
                                   Uml::TextRole tr) = 0;
 
     virtual void calculateNameTextSegment();