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

[Ralf Habacker]

SVN commit 1277475 by habacker:

Renamed setStartEndPoints() to setEndPoints() to reduce the difference to the soc-umbrello branch.

 M  +3 -3      associationline.cpp  
 M  +1 -1      associationline.h  
 M  +5 -5      associationwidget.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/associationline.cpp #1277474:1277475
@@ -315,7 +315,7 @@
 /**
  * Sets the start and end points.
  */
-bool AssociationLine::setStartEndPoints( const QPoint &start, const QPoint &end )
+bool AssociationLine::setEndPoints( const QPoint &start, const QPoint &end )
 {
     int count = m_LineList.count();
     if( count == 0 ) {
@@ -949,7 +949,7 @@
 
     int count = rhs.m_LineList.count();
     //setup start end points
-    this->setStartEndPoints( rhs.getPoint( 0 ), rhs.getPoint( count) );
+    this->setEndPoints( rhs.getPoint( 0 ), rhs.getPoint( count) );
     //now insert the rest
     for( int i = 1; i < count ; i++ ) {
         this->insertPoint( i, rhs.getPoint ( i ) );
@@ -1132,7 +1132,7 @@
     y = endElement.attribute( "endy", "0" );
     nY = y.toInt();
     QPoint endPoint( nX, nY );
-    setStartEndPoints( startPoint, endPoint );
+    setEndPoints( startPoint, endPoint );
     QPoint point;
     node = endElement.nextSibling();
     QDomElement element = node.toElement();
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/associationline.h #1277474:1277475
@@ -65,7 +65,7 @@
     bool insertPoint( int pointIndex, const QPoint &point );
     bool removePoint( int pointIndex, const QPoint &point = QPoint(), unsigned short delta = 0 );
 
-    bool setStartEndPoints( const QPoint &start, const QPoint &end );
+    bool setEndPoints( const QPoint &start, const QPoint &end );
 
     int count() const;
 
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/associationwidget.cpp #1277474:1277475
@@ -1598,7 +1598,7 @@
 
     int size = m_LinePath.count();
     if(size < 2)
-        m_LinePath.setStartEndPoints( m_role[A].m_OldCorner, m_role[B].m_OldCorner );
+        m_LinePath.setEndPoints( m_role[A].m_OldCorner, m_role[B].m_OldCorner );
 
     // See if an association to self.
     // See if it needs to be set up before we continue:
@@ -1613,12 +1613,12 @@
         int w = pWidgetA->getWidth();
         //see if above widget ok to start
         if( y - DISTANCE > 0 ) {
-            m_LinePath.setStartEndPoints( QPoint( x + w / 4, y ) , QPoint( x + w * 3 / 4, y ) );
+            m_LinePath.setEndPoints( QPoint( x + w / 4, y ) , QPoint( x + w * 3 / 4, y ) );
             m_LinePath.insertPoint( 1, QPoint( x + w / 4, y - DISTANCE ) );
             m_LinePath.insertPoint( 2 ,QPoint( x + w * 3 / 4, y - DISTANCE ) );
             m_role[A].m_WidgetRegion = m_role[B].m_WidgetRegion = North;
         } else {
-            m_LinePath.setStartEndPoints( QPoint( x + w / 4, y + h ), QPoint( x + w * 3 / 4, y + h ) );
+            m_LinePath.setEndPoints( QPoint( x + w / 4, y + h ), QPoint( x + w * 3 / 4, y + h ) );
             m_LinePath.insertPoint( 1, QPoint( x + w / 4, y + h + DISTANCE ) );
             m_LinePath.insertPoint( 2, QPoint( x + w * 3 / 4, y + h + DISTANCE ) );
             m_role[A].m_WidgetRegion = m_role[B].m_WidgetRegion = South;
@@ -1637,7 +1637,7 @@
         int hb = pWidgetB->getHeight();
         //int wb = pWidgetB->getWidth();
 
-        m_LinePath.setStartEndPoints( QPoint( xa + wa , ya + ha/2 ) , QPoint( xb , yb + hb/2 ) );
+        m_LinePath.setEndPoints( QPoint( xa + wa , ya + ha/2 ) , QPoint( xb , yb + hb/2 ) );
         m_LinePath.insertPoint( 1, QPoint( xa + wa , ya + ha/2 ));
         m_LinePath.insertPoint( 2 ,QPoint( xb , yb + hb/2 ));
         updatePointsException();
@@ -1974,7 +1974,7 @@
     if (abs(p1.y() - p2.y()) <= 10)
         ESPACEY = 15;
 
-    m_LinePath.setStartEndPoints( QPoint( xdeb , ydeb ) , QPoint( xfin , yfin ) );
+    m_LinePath.setEndPoints( QPoint( xdeb , ydeb ) , QPoint( xfin , yfin ) );
     m_LinePath.setPoint( 1, QPoint(p1.x() + ESPACEX,p1.y() + ESPACEY));
     m_LinePath.setPoint( 2 ,QPoint(p2.x() - ESPACEX,p2.y() - ESPACEY));