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

[Ralf Habacker]

SVN commit 1312717 by habacker:

Reduced differences to trunk.

 M  +2 -2      CMakeLists.txt  
 M  +1 -1      umlscene.cpp  
 M  +3 -1      umlscene.h  
 M  +2 -1      widgets/umlwidget.h  


--- branches/work/soc-umbrello/umbrello/CMakeLists.txt #1312716:1312717
@@ -338,8 +338,8 @@
 set(libcmds_SRCS
     cmds/cmd_create_diagram.cpp
     cmds/cmd_handle_rename.cpp
-    cmds/cmd_moveWidget.cpp
-    cmds/cmd_resizeWidget.cpp
+    #cmds/cmd_moveWidget.cpp
+    #cmds/cmd_resizeWidget.cpp
     cmds/cmd_set_stereotype.cpp
     cmds/cmd_set_visibility.cpp
 
--- branches/work/soc-umbrello/umbrello/umlscene.cpp #1312716:1312717
@@ -3760,7 +3760,7 @@
 /**
  * Returns the input coordinate with possible grid-snap applied.
  */
-UMLSceneValue UMLScene::snappedY(UMLSceneValue y)
+UMLSceneValue UMLScene::snappedY(UMLSceneValue _y)
 {
     int y = (int)_y;
     if (snapToGrid()) {
--- branches/work/soc-umbrello/umbrello/umlscene.h #1312716:1312717
@@ -67,11 +67,13 @@
 typedef qreal UMLSceneValue;
 typedef QPolygonF UMLScenePolygon;
 // event types
-typedef QGraphicsSceneMouseEvent UMLSceneMouseEvent;
+#define UMLSceneMouseEvent QGraphicsSceneMouseEvent
 //typedef QGraphicsSceneKeyEvent UMLSceneKeyEvent;
 typedef QGraphicsSceneHoverEvent UMLSceneHoverEvent;
 typedef QGraphicsSceneContextMenuEvent UMLSceneContextMenuEvent;
 typedef QGraphicsSceneDragDropEvent UMLSceneDragDropEvent;
+typedef QGraphicsSceneDragDropEvent UMLSceneDragEnterEvent;
+typedef QGraphicsSceneDragDropEvent UMLSceneDragMoveEvent;
 
 typedef QGraphicsLineItem UMLSceneLineItem;
 typedef QGraphicsRectItem UMLSceneRectItem;
--- branches/work/soc-umbrello/umbrello/widgets/umlwidget.h #1312716:1312717
@@ -20,8 +20,9 @@
 #ifndef UMLWIDGET_H
 #define UMLWIDGET_H
 
+#include "associationwidgetlist.h"
+#include "umlscene.h"
 #include "widgetbase.h"
-#include "associationwidgetlist.h"
 
 class AssociationSpaceManager;
 class AssociationWidget;