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

[Andi Fischer]

SVN commit 1326041 by fischer:

UMLSceneContextMenuEvent removed.

 M  +1 -1      umlscene.cpp  
 M  +1 -2      umlscene.h  
 M  +1 -1      widgets/statewidget.h  


--- trunk/KDE/kdesdk/umbrello/umbrello/umlscene.cpp #1326040:1326041
@@ -3008,7 +3008,7 @@
 /**
  * Event handler for context menu events.
  */
-void UMLScene::contextMenuEvent(UMLSceneContextMenuEvent* contextMenuEvent)
+void UMLScene::contextMenuEvent(QGraphicsSceneContextMenuEvent* contextMenuEvent)
 {
     UMLWidget* widget = widgetAt(contextMenuEvent->scenePos());
     if (widget) {
--- trunk/KDE/kdesdk/umbrello/umbrello/umlscene.h #1326040:1326041
@@ -71,7 +71,6 @@
 // event types
 typedef QKeyEvent UMLSceneKeyEvent;
 typedef QGraphicsSceneHoverEvent UMLSceneHoverEvent;
-typedef QGraphicsSceneContextMenuEvent UMLSceneContextMenuEvent;
 typedef QGraphicsSceneDragDropEvent UMLSceneDragDropEvent;
 typedef QGraphicsSceneDragDropEvent UMLSceneDragEnterEvent;
 typedef QGraphicsSceneDragDropEvent UMLSceneDragMoveEvent;
@@ -366,7 +365,7 @@
     void mousePressEvent(QGraphicsSceneMouseEvent* mouseEvent);
     void mouseDoubleClickEvent(QGraphicsSceneMouseEvent* mouseEvent);
     void mouseReleaseEvent(QGraphicsSceneMouseEvent* mouseEvent);
-    virtual void contextMenuEvent(UMLSceneContextMenuEvent* contextMenuEvent);
+    virtual void contextMenuEvent(QGraphicsSceneContextMenuEvent* contextMenuEvent);
 
     UMLSceneRect diagramRect();
 
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/statewidget.h #1326040:1326041
@@ -87,7 +87,7 @@
     UMLSceneSize maximumSize();
     void setAspectRatioMode();
 
-public slots:
+public Q_SLOTS:
     virtual void slotMenuSelection(QAction* action);
 
 private: