Squashed commit of the topic/exceptions branch.

Contains some smaller fixes and renaming of macros. Looks big,
but isn't scary at all ;)

1 files changed, 10 insertions, 10 deletions

diff --git a/src/gui/graphicsview/qgraphicssceneevent.h b/src/gui/graphicsview/qgraphicssceneevent.h
index c6a3eff..6850b3d 100644
--- a/src/gui/graphicsview/qgraphicssceneevent.h
+++ b/src/gui/graphicsview/qgraphicssceneevent.h
@@ -76,7 +76,7 @@ public:
 protected:
     QGraphicsSceneEvent(QGraphicsSceneEventPrivate &dd, Type type = None);
     QScopedPointer<QGraphicsSceneEventPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QGraphicsSceneEvent)
+    Q_DECLARE_SCOPED_PRIVATE(QGraphicsSceneEvent)
 };
 
 class QGraphicsSceneMouseEventPrivate;
@@ -123,7 +123,7 @@ public:
     void setModifiers(Qt::KeyboardModifiers modifiers);
 
 private:
-    Q_DECLARE_PRIVATE(QGraphicsSceneMouseEvent)
+    Q_DECLARE_SCOPED_PRIVATE(QGraphicsSceneMouseEvent)
 };
 
 class QGraphicsSceneWheelEventPrivate;
@@ -155,7 +155,7 @@ public:
     void setOrientation(Qt::Orientation orientation);
 
 private:
-    Q_DECLARE_PRIVATE(QGraphicsSceneWheelEvent)
+    Q_DECLARE_SCOPED_PRIVATE(QGraphicsSceneWheelEvent)
 };
 
 class QGraphicsSceneContextMenuEventPrivate;
@@ -183,7 +183,7 @@ public:
     void setReason(Reason reason);
 
 private:
-    Q_DECLARE_PRIVATE(QGraphicsSceneContextMenuEvent)
+    Q_DECLARE_SCOPED_PRIVATE(QGraphicsSceneContextMenuEvent)
 };
 
 class QGraphicsSceneHoverEventPrivate;
@@ -215,7 +215,7 @@ public:
     void setModifiers(Qt::KeyboardModifiers modifiers);
 
 private:
-    Q_DECLARE_PRIVATE(QGraphicsSceneHoverEvent)
+    Q_DECLARE_SCOPED_PRIVATE(QGraphicsSceneHoverEvent)
 };
 
 class QGraphicsSceneHelpEventPrivate;
@@ -232,7 +232,7 @@ public:
     void setScreenPos(const QPoint &pos);
 
 private:
-    Q_DECLARE_PRIVATE(QGraphicsSceneHelpEvent)
+    Q_DECLARE_SCOPED_PRIVATE(QGraphicsSceneHelpEvent)
 };
 
 class QGraphicsSceneDragDropEventPrivate;
@@ -274,13 +274,13 @@ public:
     void setMimeData(const QMimeData *data);
 
 private:
-    Q_DECLARE_PRIVATE(QGraphicsSceneDragDropEvent)
+    Q_DECLARE_SCOPED_PRIVATE(QGraphicsSceneDragDropEvent)
 };
 
 class QGraphicsSceneResizeEventPrivate;
 class Q_GUI_EXPORT QGraphicsSceneResizeEvent : public QGraphicsSceneEvent
 {
-    Q_DECLARE_PRIVATE(QGraphicsSceneResizeEvent)
+    Q_DECLARE_SCOPED_PRIVATE(QGraphicsSceneResizeEvent)
 public:
     QGraphicsSceneResizeEvent();
     ~QGraphicsSceneResizeEvent();
@@ -295,7 +295,7 @@ public:
 class QGraphicsSceneMoveEventPrivate;
 class Q_GUI_EXPORT QGraphicsSceneMoveEvent : public QGraphicsSceneEvent
 {
-    Q_DECLARE_PRIVATE(QGraphicsSceneMoveEvent)
+    Q_DECLARE_SCOPED_PRIVATE(QGraphicsSceneMoveEvent)
 public:
     QGraphicsSceneMoveEvent();
     ~QGraphicsSceneMoveEvent();
@@ -312,7 +312,7 @@ class QGraphicsItem;
 class QGraphicsSceneGestureEventPrivate;
 class Q_GUI_EXPORT QGraphicsSceneGestureEvent : public QGraphicsSceneEvent
 {
-    Q_DECLARE_PRIVATE(QGraphicsSceneGestureEvent)
+    Q_DECLARE_SCOPED_PRIVATE(QGraphicsSceneGestureEvent)
 public:
     QGraphicsSceneGestureEvent();
     ~QGraphicsSceneGestureEvent();