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

[Laurent Montel]

SVN commit 594489 by mlaurent:

Byebye Q3PointArray


 M  +2 -2      activitywidget.cpp  
 M  +2 -2      artifactwidget.cpp  
 M  +2 -2      linepath.h  
 M  +2 -2      messagewidget.cpp  
 M  +2 -3      nodewidget.cpp  
 M  +1 -1      notewidget.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/activitywidget.cpp #594488:594489
@@ -30,7 +30,7 @@
 
 //Added by qt3to4:
 #include <QMouseEvent>
-#include <Q3PointArray>
+#include <QPolygon>
 
 ActivityWidget::ActivityWidget(UMLView * view, ActivityType activityType, Uml::IDType id )
         : UMLWidget(view, id)
@@ -83,7 +83,7 @@
         UMLWidget::setPen(p);
         p.setBrush( UMLWidget::getFillColour() );
         {
-            Q3PointArray array( 4 );
+            QPolygon array( 4 );
             array[ 0 ] = QPoint( offsetX + w / 2, offsetY );
             array[ 1 ] = QPoint( offsetX + w, offsetY  + h / 2 );
             array[ 2 ] = QPoint( offsetX + w / 2, offsetY + h );
--- trunk/KDE/kdesdk/umbrello/umbrello/artifactwidget.cpp #594488:594489
@@ -88,7 +88,7 @@
 
     int startX = offsetX + (w/2) - 25;
     int iconHeight = h - fontHeight;
-    Q3PointArray pointArray(5);
+    QPolygon pointArray(5);
     pointArray.setPoint(0, startX, offsetY);
     pointArray.setPoint(1, startX + 40, offsetY);
     pointArray.setPoint(2, startX + 50, offsetY + 10);
@@ -122,7 +122,7 @@
 
     const int startX = offsetX + (w/2) - 25;
     const int iconHeight = h - fontHeight;
-    Q3PointArray pointArray(5);
+    QPolygon pointArray(5);
     pointArray.setPoint(0, startX, offsetY);
     pointArray.setPoint(1, startX + 40, offsetY);
     pointArray.setPoint(2, startX + 50, offsetY + 10);
--- trunk/KDE/kdesdk/umbrello/umbrello/linepath.h #594488:594489
@@ -334,7 +334,7 @@
     /**
     *   Contains calculated points used to draw the line head.
     */
-    Q3PointArray m_PointArray;
+    QPolygon m_PointArray;
 
     /**
     *   Contains calculated points used to draw the line head.
@@ -355,7 +355,7 @@
     *   Contains the calculated points for the parallel line
     *   on a collaboration message to use.
     */
-    Q3PointArray m_ParallelLines;
+    QPolygon m_ParallelLines;
 
     /**
     *   Region where the line docks
--- trunk/KDE/kdesdk/umbrello/umbrello/messagewidget.cpp #594488:594489
@@ -13,7 +13,7 @@
 #include <qpainter.h>
 //Added by qt3to4:
 #include <QMouseEvent>
-#include <Q3PointArray>
+#include <QPolygon>
 #include <QMoveEvent>
 #include <QResizeEvent>
 //kde includes
@@ -102,7 +102,7 @@
     if (direction == Qt::RightArrow) {
         arrowheadExtentX = -arrowheadExtentX;
     }
-    Q3PointArray points;
+    QPolygon points;
     points.putPoints(0, 3, x, y, x + arrowheadExtentX, y - 3, x + arrowheadExtentX, y + 3);
     p.setBrush( QBrush(p.pen().color()) );
     p.drawPolygon(points);
--- trunk/KDE/kdesdk/umbrello/umbrello/nodewidget.cpp #594488:594489
@@ -17,8 +17,7 @@
 #include "umlview.h"
 #include <kdebug.h>
 #include <qpainter.h>
-//Added by qt3to4:
-#include <Q3PointArray>
+#include <QPolygon>
 
 NodeWidget::NodeWidget(UMLView * view, UMLNode *n )
   : UMLWidget(view, n) {
@@ -52,7 +51,7 @@
     const int fontHeight  = fm.lineSpacing();
     QString name = getName();
 
-    Q3PointArray pointArray(5);
+    QPolygon pointArray(5);
     pointArray.setPoint(0, offsetX, bodyOffsetY);
     pointArray.setPoint(1, offsetX + wDepth, offsetY);
     pointArray.setPoint(2, offsetX + w - 1, offsetY);
--- trunk/KDE/kdesdk/umbrello/umbrello/notewidget.cpp #594488:594489
@@ -141,7 +141,7 @@
     int w = width()-1;
 
     int h= height()-1;
-    Q3PointArray poly(6);
+    QPolygon poly(6);
     poly.setPoint(0, offsetX, offsetY);
     poly.setPoint(1, offsetX, offsetY + h);
     poly.setPoint(2, offsetX + w, offsetY + h);