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

[Ralf Habacker]

SVN commit 1288339 by habacker:

Reduced differences to soc-umbrello branch.

 M  +4 -4      associationwidget.cpp  
 M  +4 -0      floatingtextwidget.cpp  
 M  +2 -2      floatingtextwidget.h  


--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/associationwidget.cpp #1288338:1288339
@@ -2709,8 +2709,8 @@
     FloatingTextWidget *ft = textWidgetByRole(role);
     if (ft == NULL)
         return;
-    int ftX = ft->x();
-    int ftY = ft->y();
+    UMLSceneValue ftX = ft->x();
+    UMLSceneValue ftY = ft->y();
     if ( (ftX < 0 || ftX > FloatingTextWidget::restrictPositionMax) ||
             (ftY < 0 || ftY > FloatingTextWidget::restrictPositionMax) ) {
         uDebug() << "blocked because the FloatingTextWidget original position ("
@@ -2721,8 +2721,8 @@
     QPoint pos = calculateTextPosition(role);
     int relX = pos.x() - oldPosition.x();
     int relY = pos.y() - oldPosition.y();
-    int ftNewX = ftX + relX;
-    int ftNewY = ftY + relY;
+    UMLSceneValue ftNewX = ftX + relX;
+    UMLSceneValue ftNewY = ftY + relY;
     if ( (ftNewX < 0 || ftNewX > FloatingTextWidget::restrictPositionMax) ||
             (ftNewY < 0 || ftNewY > FloatingTextWidget::restrictPositionMax) ) {
         uDebug() << "blocked because the FloatingTextWidget new position ("
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/floatingtextwidget.cpp #1288338:1288339
@@ -39,6 +39,10 @@
 #include <QtGui/QPainter>
 #include <QtGui/QValidator>
 
+
+const UMLSceneValue FloatingTextWidget::restrictPositionMin = 0;
+const UMLSceneValue FloatingTextWidget::restrictPositionMax = 3000;
+
 /**
  * Constructs a FloatingTextWidget instance.
  *
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/floatingtextwidget.h #1288338:1288339
@@ -48,8 +48,8 @@
         max limits => if x or y is outside of interval, the position
         is reset ( e.g. by AssociationWidget::resetTextPositions() )
      */
-    static const int restrictPositionMin = 0;
-    static const int restrictPositionMax = 3000;
+    static const UMLSceneValue restrictPositionMin;
+    static const UMLSceneValue restrictPositionMax;
 
     explicit FloatingTextWidget(UMLScene * scene, Uml::TextRole role = Uml::TextRole::Floating,
                                 const QString& text = "", Uml::IDType id = Uml::id_None);