Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public

Conflicts fixed:
	src/corelib/io/qdiriterator.cpp

1 files changed, 9 insertions, 52 deletions

diff --git a/src/gui/graphicsview/qgraphicssceneevent.h b/src/gui/graphicsview/qgraphicssceneevent.h
index 6850b3d..ea17f9d 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_SCOPED_PRIVATE(QGraphicsSceneEvent)
+    Q_DECLARE_PRIVATE(QGraphicsSceneEvent)
 };
 
 class QGraphicsSceneMouseEventPrivate;
@@ -123,7 +123,7 @@ public:
     void setModifiers(Qt::KeyboardModifiers modifiers);
 
 private:
-    Q_DECLARE_SCOPED_PRIVATE(QGraphicsSceneMouseEvent)
+    Q_DECLARE_PRIVATE(QGraphicsSceneMouseEvent)
 };
 
 class QGraphicsSceneWheelEventPrivate;
@@ -155,7 +155,7 @@ public:
     void setOrientation(Qt::Orientation orientation);
 
 private:
-    Q_DECLARE_SCOPED_PRIVATE(QGraphicsSceneWheelEvent)
+    Q_DECLARE_PRIVATE(QGraphicsSceneWheelEvent)
 };
 
 class QGraphicsSceneContextMenuEventPrivate;
@@ -183,7 +183,7 @@ public:
     void setReason(Reason reason);
 
 private:
-    Q_DECLARE_SCOPED_PRIVATE(QGraphicsSceneContextMenuEvent)
+    Q_DECLARE_PRIVATE(QGraphicsSceneContextMenuEvent)
 };
 
 class QGraphicsSceneHoverEventPrivate;
@@ -215,7 +215,7 @@ public:
     void setModifiers(Qt::KeyboardModifiers modifiers);
 
 private:
-    Q_DECLARE_SCOPED_PRIVATE(QGraphicsSceneHoverEvent)
+    Q_DECLARE_PRIVATE(QGraphicsSceneHoverEvent)
 };
 
 class QGraphicsSceneHelpEventPrivate;
@@ -232,7 +232,7 @@ public:
     void setScreenPos(const QPoint &pos);
 
 private:
-    Q_DECLARE_SCOPED_PRIVATE(QGraphicsSceneHelpEvent)
+    Q_DECLARE_PRIVATE(QGraphicsSceneHelpEvent)
 };
 
 class QGraphicsSceneDragDropEventPrivate;
@@ -274,13 +274,13 @@ public:
     void setMimeData(const QMimeData *data);
 
 private:
-    Q_DECLARE_SCOPED_PRIVATE(QGraphicsSceneDragDropEvent)
+    Q_DECLARE_PRIVATE(QGraphicsSceneDragDropEvent)
 };
 
 class QGraphicsSceneResizeEventPrivate;
 class Q_GUI_EXPORT QGraphicsSceneResizeEvent : public QGraphicsSceneEvent
 {
-    Q_DECLARE_SCOPED_PRIVATE(QGraphicsSceneResizeEvent)
+    Q_DECLARE_PRIVATE(QGraphicsSceneResizeEvent)
 public:
     QGraphicsSceneResizeEvent();
     ~QGraphicsSceneResizeEvent();
@@ -295,7 +295,7 @@ public:
 class QGraphicsSceneMoveEventPrivate;
 class Q_GUI_EXPORT QGraphicsSceneMoveEvent : public QGraphicsSceneEvent
 {
-    Q_DECLARE_SCOPED_PRIVATE(QGraphicsSceneMoveEvent)
+    Q_DECLARE_PRIVATE(QGraphicsSceneMoveEvent)
 public:
     QGraphicsSceneMoveEvent();
     ~QGraphicsSceneMoveEvent();
@@ -307,49 +307,6 @@ public:
     void setNewPos(const QPointF &pos);
 };
 
-class QGesture;
-class QGraphicsItem;
-class QGraphicsSceneGestureEventPrivate;
-class Q_GUI_EXPORT QGraphicsSceneGestureEvent : public QGraphicsSceneEvent
-{
-    Q_DECLARE_SCOPED_PRIVATE(QGraphicsSceneGestureEvent)
-public:
-    QGraphicsSceneGestureEvent();
-    ~QGraphicsSceneGestureEvent();
-
-    bool contains(const QString &type) const;
-    bool contains(Qt::GestureType type) const;
-
-    QList<QString> gestureTypes() const;
-
-    const QGesture* gesture(Qt::GestureType type) const;
-    const QGesture* gesture(const QString &type) const;
-    QList<QGesture*> gestures() const;
-    void setGestures(const QList<QGesture*> &gestures);
-    void setGestures(const QSet<QGesture*> &gestures);
-
-    QSet<QString> cancelledGestures() const;
-    void setCancelledGestures(const QSet<QString> &cancelledGestures);
-
-    void acceptAll();
-#ifndef Q_NO_USING_KEYWORD
-    using QEvent::accept;
-#else
-    inline void accept() { QEvent::accept(); }
-#endif
-    void accept(Qt::GestureType type);
-    void accept(const QString &type);
-
-    QPointF mapToScene(const QPoint &point) const;
-    QPolygonF mapToScene(const QRect &rect) const;
-    QPointF mapToItem(const QPoint &point, QGraphicsItem *item) const;
-    QPolygonF mapToItem(const QRect &rect, QGraphicsItem *item) const;
-
-protected:
-    QHash<QString, QGesture*> m_gestures;
-    QSet<QString> m_cancelledGestures;
-};
-
 #endif // QT_NO_GRAPHICSVIEW
 
 QT_END_NAMESPACE