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

[Ralf Habacker]

SVN commit 1288340 by habacker:

Reduced differences to soc-umbrello branch.

 M  +5 -5      linkwidget.cpp  
 M  +3 -4      linkwidget.h  


--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/linkwidget.cpp #1288339:1288340
@@ -4,7 +4,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   copyright (C) 2004-2011                                               *
+ *   copyright (C) 2004-2012                                               *
  *   Umbrello UML Modeller Authors <uml-devel at uml.sf.net>                  *
  ***************************************************************************/
 
@@ -12,11 +12,11 @@
 #include "linkwidget.h"
 
 // app includes
-#include "umlview.h"
-#include "umlobject.h"
 #include "classifier.h"
 #include "operation.h"
 #include "uml.h"
+#include "umlobject.h"
+#include "umlview.h"
 
 LinkWidget::LinkWidget()
 {
@@ -39,9 +39,9 @@
 
 /**
  * Return the operation text.
- * When no view parameter is given, the current view
+ * When no scene parameter is given, the scene of the current view
  * is taken instead.
- * @param scene   the given view
+ * @param scene   the given scene
  * @return the operation text
  */
 QString LinkWidget::operationText(UMLScene *scene)
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/linkwidget.h #1288339:1288340
@@ -14,13 +14,12 @@
 #include <QtGui/QFont>
 
 #include "basictypes.h"
+#include "umlscene.h"
 
 // forward declarations
 class UMLClassifier;
 class UMLOperation;
 class FloatingTextWidget;
-class UMLScene;
-class UMLView;
 
 /**
  * This is an interface realized by AssociationWidget and MessageWidget.
@@ -100,8 +99,8 @@
      * Abstract operation implemented by inheriting classes.
      * Motivated by FloatingTextWidget::mouseMoveEvent()
      */
-    virtual void constrainTextPos(int &textX, int &textY,
-                                  int textWidth, int textHeight,
+    virtual void constrainTextPos(UMLSceneValue &textX, UMLSceneValue &textY,
+                                  UMLSceneValue textWidth, UMLSceneValue textHeight,
                                   Uml::TextRole tr) = 0;
 
     virtual void calculateNameTextSegment();