[Uml-devel] KDE/kdesdk/umbrello

[Oliver Kellogg]

SVN commit 486149 by okellogg:

apply commit 486148 from branches/KDE/3.5

 M  +5 -0      ChangeLog  
 M  +2 -10     umbrello/associationwidget.cpp  


--- trunk/KDE/kdesdk/umbrello/ChangeLog #486148:486149
@@ -1,3 +1,8 @@
+Version 1.5.1
+
+* Bugs fixed / wishes implemented (see http://bugs.kde.org)
+117791
+
 Version 1.5
 
 * Association classes
--- trunk/KDE/kdesdk/umbrello/umbrello/associationwidget.cpp #486148:486149
@@ -1802,14 +1802,6 @@
 
     if (text) {
         constrainTextPos(x, y, textW, textH, role);
-        if (x != p.x() || y != p.y()) {
-            // kdDebug() << "AssociationWidget::calculateTextPosition(" 
-            //   << text->getName() << ") textrole " << role
-            //   << ": oldpoint=(" << p.x() << "," << p.y() << ")"
-            //   << ", newPoint=(" << x << "," << y << ")" << endl;
-            text->setX(x);
-            text->setY(y);
-        }
     }
     p = QPoint( x, y );
     return p;
@@ -1838,8 +1830,8 @@
             atSideB = true;
             break;
         case tr_Name:
-        case tr_Seq_Message:
-        case tr_State:
+        case tr_Coll_Message:  // CHECK: collab.msg texts seem to be tr_Name
+        case tr_State:         // CHECK: is this used?
             // Find the linepath segment to which the (textX,textY) is closest
             // and constrain to the corridor of that segment (see farther below)
             {