[Uml-devel] branches/work/soc-umbrello/umbrello

[Andi Fischer]

SVN commit 1288787 by fischer:

Differences to trunk reduced.

 M  +1 -1      messagewidgetlist.h  
 M  +2 -2      umlscene.h  
 M  +1 -1      widgets/widget_utils.cpp  
 M  +4 -6      widgets/widget_utils.h  


--- branches/work/soc-umbrello/umbrello/messagewidgetlist.h #1288786:1288787
@@ -12,7 +12,7 @@
 #ifndef MESSAGEWIDGETLIST_H
 #define MESSAGEWIDGETLIST_H
 
-#include <qlist.h>
+#include <QtCore/QList>
 
 class MessageWidget;
 
--- branches/work/soc-umbrello/umbrello/umlscene.h #1288786:1288787
@@ -71,8 +71,8 @@
 typedef QGraphicsSceneContextMenuEvent UMLSceneContextMenuEvent;
 typedef QGraphicsSceneDragDropEvent UMLSceneDragDropEvent;
 
-typedef QGraphicsLineItem UMLSceneLine;
-typedef QGraphicsRectItem UMLSceneRectangle;
+typedef QGraphicsLineItem UMLSceneLineItem;
+typedef QGraphicsRectItem UMLSceneRectItem;
 //typedef QGraphicsSceneItem UMLSceneItem;
 typedef QGraphicsPolygonItem UMLScenePolygon;
 typedef QGraphicsEllipseItem UMLSceneEllipse;
--- branches/work/soc-umbrello/umbrello/widgets/widget_utils.cpp #1288786:1288787
@@ -68,7 +68,7 @@
      * @param p   the base point
      * @return    the decoration point
      */
-    QGraphicsRectItem *decoratePoint(const QPointF& p)
+    UMLSceneRectItem* decoratePoint(const UMLScenePoint& p)
     {
         const int SIZE = 4;
         UMLView *currentView = UMLApp::app()->currentView();
--- branches/work/soc-umbrello/umbrello/widgets/widget_utils.h #1288786:1288787
@@ -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,8 +12,9 @@
 #define WIDGET_UTILS_H
 
 #include "basictypes.h"
-#include "umlwidgetlist.h"
 #include "messagewidgetlist.h"
+#include "umlscene.h"
+#include "umlwidgetlist.h"
 
 #include <QtCore/QPoint>
 #include <QtXml/QDomDocument>
@@ -21,9 +22,6 @@
 #include <QtGui/QPen>
 #include <QtGui/QFont>
 
-// forward declarations
-class QGraphicsRectItem;
-
 /**
  * General purpose widget utilities.
  * Bugs and comments to uml-devel at lists.sf.net or http://bugs.kde.org
@@ -34,7 +32,7 @@
                           const UMLWidgetList& widgets,
                           const MessageWidgetList* messages = 0);
 
-    QGraphicsRectItem *decoratePoint(const QPointF& p);
+    UMLSceneRectItem* decoratePoint(const UMLScenePoint& p);
 
     void drawCrossInEllipse(QPainter *p, const QRectF& ellipse);
     void drawTriangledRect(QPainter *painter, const QRectF& rect, const QSizeF& triSize);