Move QGraphicsSceneIndex into private headers (=> _p.h).

We'd like to keep this API private for now.

Reviewed-by: Alexis

9 files changed, 106 insertions, 179 deletions

diff --git a/src/gui/graphicsview/graphicsview.pri b/src/gui/graphicsview/graphicsview.pri
index 5ac1c54..2d8f37e 100644
--- a/src/gui/graphicsview/graphicsview.pri
+++ b/src/gui/graphicsview/graphicsview.pri
@@ -1,46 +1,43 @@
 # Qt graphicsview module
-HEADERS += graphicsview/qgraphicsitem.h \
+HEADERS += graphicsview/qgraphicsgridlayout.h \
+    graphicsview/qgraphicsitem.h \
     graphicsview/qgraphicsitem_p.h \
     graphicsview/qgraphicsitemanimation.h \
+    graphicsview/qgraphicslayout.h \
+    graphicsview/qgraphicslayout_p.h \
+    graphicsview/qgraphicslayoutitem.h \
+    graphicsview/qgraphicslayoutitem_p.h \
+    graphicsview/qgraphicslinearlayout.h \
+    graphicsview/qgraphicsproxywidget.h \
     graphicsview/qgraphicsscene.h \
-    graphicsview/qgraphicsscene_p.h \
     graphicsview/qgraphicsscene_bsp_p.h \
-    graphicsview/qgraphicsscenelinearindex.h \
-    graphicsview/qgraphicssceneindex.h \
-    graphicsview/qgraphicssceneindex_p.h \
+    graphicsview/qgraphicsscene_p.h \
     graphicsview/qgraphicsscenebsptreeindex.h \
     graphicsview/qgraphicsscenebsptreeindex_p.h \
     graphicsview/qgraphicssceneevent.h \
+    graphicsview/qgraphicssceneindex_p.h \
+    graphicsview/qgraphicsscenelinearindex.h \
+    graphicsview/qgraphicsview.h \
     graphicsview/qgraphicsview_p.h \
-    graphicsview/qgraphicsview.h
-SOURCES += graphicsview/qgraphicsitem.cpp \
-    graphicsview/qgraphicsitemanimation.cpp \
-    graphicsview/qgraphicsscene.cpp \
-    graphicsview/qgraphicsscene_bsp.cpp \
-    graphicsview/qgraphicsscenebsptreeindex.cpp \
-    graphicsview/qgraphicsscenelinearindex.cpp \
-    graphicsview/qgraphicssceneindex.cpp \
-    graphicsview/qgraphicssceneevent.cpp \
-    graphicsview/qgraphicsview.cpp
-
-
-# Widgets on the canvas
-HEADERS += graphicsview/qgraphicslayout.h \
-    graphicsview/qgraphicslayout_p.h \
-    graphicsview/qgraphicslayoutitem.h \
-    graphicsview/qgraphicslayoutitem_p.h \
-    graphicsview/qgraphicslinearlayout.h \
     graphicsview/qgraphicswidget.h \
     graphicsview/qgraphicswidget_p.h \
-    graphicsview/qgridlayoutengine_p.h \
-    graphicsview/qgraphicsproxywidget.h \
-    graphicsview/qgraphicsgridlayout.h
-SOURCES += graphicsview/qgraphicslayout.cpp \
+    graphicsview/qgridlayoutengine_p.h
+
+SOURCES += graphicsview/qgraphicsgridlayout.cpp \
+    graphicsview/qgraphicsitem.cpp \
+    graphicsview/qgraphicsitemanimation.cpp \
+    graphicsview/qgraphicslayout.cpp \
     graphicsview/qgraphicslayout_p.cpp \
     graphicsview/qgraphicslayoutitem.cpp \
     graphicsview/qgraphicslinearlayout.cpp \
+    graphicsview/qgraphicsproxywidget.cpp \
+    graphicsview/qgraphicsscene.cpp \
+    graphicsview/qgraphicsscene_bsp.cpp \
+    graphicsview/qgraphicsscenebsptreeindex.cpp \
+    graphicsview/qgraphicssceneevent.cpp \
+    graphicsview/qgraphicssceneindex.cpp \
+    graphicsview/qgraphicsscenelinearindex.cpp \
+    graphicsview/qgraphicsview.cpp \
     graphicsview/qgraphicswidget.cpp \
     graphicsview/qgraphicswidget_p.cpp \
-    graphicsview/qgridlayoutengine.cpp \
-    graphicsview/qgraphicsproxywidget.cpp \
-    graphicsview/qgraphicsgridlayout.cpp
+    graphicsview/qgridlayoutengine.cpp
diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp
index 55f0f20..9d224b1 100644
--- a/src/gui/graphicsview/qgraphicsscene.cpp
+++ b/src/gui/graphicsview/qgraphicsscene.cpp
@@ -217,7 +217,6 @@
 #include "qgraphicsview_p.h"
 #include "qgraphicswidget.h"
 #include "qgraphicswidget_p.h"
-#include "qgraphicssceneindex.h"
 #include "qgraphicsscenebsptreeindex.h"
 #include "qgraphicsscenelinearindex.h"
 
@@ -244,6 +243,7 @@
 #include <QtGui/qtooltip.h>
 #include <QtGui/qtransform.h>
 #include <private/qapplication_p.h>
+#include <private/qgraphicssceneindex_p.h>
 #include <private/qobject_p.h>
 #ifdef Q_WS_X11
 #include <private/qt_x11_p.h>
@@ -772,6 +772,7 @@ QList<QGraphicsItem *> QGraphicsScenePrivate::itemsAtPosition(const QPoint &scre
                                                               const QPointF &scenePos,
                                                               QWidget *widget) const
 {
+    Q_UNUSED(screenPos);
     Q_Q(const QGraphicsScene);
     QGraphicsView *view = widget ? qobject_cast<QGraphicsView *>(widget->parentWidget()) : 0;
     return q->items(scenePos, Qt::IntersectsItemShape, Qt::AscendingOrder,
@@ -1806,7 +1807,7 @@ void QGraphicsScene::setSelectionArea(const QPainterPath &path)
 */
 void QGraphicsScene::setSelectionArea(const QPainterPath &path, Qt::ItemSelectionMode mode)
 {
-    setSelectionArea(path, Qt::IntersectsItemShape, QTransform());
+    setSelectionArea(path, mode, QTransform());
 }
 
 /*!
diff --git a/src/gui/graphicsview/qgraphicsscene_p.h b/src/gui/graphicsview/qgraphicsscene_p.h
index a081e04..fd25283 100644
--- a/src/gui/graphicsview/qgraphicsscene_p.h
+++ b/src/gui/graphicsview/qgraphicsscene_p.h
@@ -58,7 +58,6 @@
 #if !defined(QT_NO_GRAPHICSVIEW) || (QT_EDITION & QT_MODULE_GRAPHICSVIEW) != QT_MODULE_GRAPHICSVIEW
 
 #include "qgraphicsscenebsptreeindex_p.h"
-#include "qgraphicssceneindex.h"
 #include "qgraphicsview.h"
 #include "qgraphicsitem_p.h"
 
@@ -74,6 +73,7 @@
 
 QT_BEGIN_NAMESPACE
 
+class QGraphicsSceneIndex;
 class QGraphicsView;
 class QGraphicsWidget;
 
diff --git a/src/gui/graphicsview/qgraphicsscenebsptreeindex.cpp b/src/gui/graphicsview/qgraphicsscenebsptreeindex.cpp
index 40cafa6..54bf09b 100644
--- a/src/gui/graphicsview/qgraphicsscenebsptreeindex.cpp
+++ b/src/gui/graphicsview/qgraphicsscenebsptreeindex.cpp
@@ -80,12 +80,12 @@
 #ifndef QT_NO_GRAPHICSVIEW
 
 #include "qgraphicsscenebsptreeindex_p.h"
-#include "qgraphicssceneindex_p.h"
 #include "qgraphicsitem_p.h"
 #include "qgraphicsscene_p.h"
 
-#include <QtCore/qmath.h>
+#include <private/qgraphicssceneindex_p.h>
 
+#include <QtCore/qmath.h>
 #include <QtCore/qdebug.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/gui/graphicsview/qgraphicsscenebsptreeindex.h b/src/gui/graphicsview/qgraphicsscenebsptreeindex.h
index 504ea8b..f3c77d3 100644
--- a/src/gui/graphicsview/qgraphicsscenebsptreeindex.h
+++ b/src/gui/graphicsview/qgraphicsscenebsptreeindex.h
@@ -67,7 +67,7 @@ QT_MODULE(Gui)
 #include <QtCore/qlist.h>
 #include <QtGui/qgraphicsitem.h>
 #include <QtGui/qgraphicsscene.h>
-#include <QtGui/qgraphicssceneindex.h>
+#include <private/qgraphicssceneindex_p.h>
 
 #include "qgraphicsscene_bsp_p.h"
 
diff --git a/src/gui/graphicsview/qgraphicssceneindex.cpp b/src/gui/graphicsview/qgraphicssceneindex.cpp
index eb3abc1..8d7581f 100644
--- a/src/gui/graphicsview/qgraphicssceneindex.cpp
+++ b/src/gui/graphicsview/qgraphicssceneindex.cpp
@@ -56,12 +56,11 @@
     \sa QGraphicsScene, QGraphicsView
 */
 
-#include "qgraphicssceneindex.h"
-#include "qgraphicssceneindex_p.h"
 #include "qgraphicsscene.h"
 #include "qgraphicsitem_p.h"
 #include "qgraphicsscene_p.h"
 #include "qgraphicswidget.h"
+#include <private/qgraphicssceneindex_p.h>
 
 #ifndef QT_NO_GRAPHICSVIEW
 
@@ -621,6 +620,6 @@ void QGraphicsSceneIndex::sceneRectChanged(const QRectF &rect)
 
 QT_END_NAMESPACE
 
-#include "moc_qgraphicssceneindex.cpp"
+#include "moc_qgraphicssceneindex_p.cpp"
 
 #endif // QT_NO_GRAPHICSVIEW
diff --git a/src/gui/graphicsview/qgraphicssceneindex.h b/src/gui/graphicsview/qgraphicssceneindex.h
deleted file mode 100644
index 25ece04..0000000
--- a/src/gui/graphicsview/qgraphicssceneindex.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QGRAPHICSSCENEINDEX_H
-#define QGRAPHICSSCENEINDEX_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists for the convenience
-// of qapplication_*.cpp, qwidget*.cpp and qfiledialog.cpp.  This header
-// file may change from version to version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtCore/qnamespace.h>
-#include <QtCore/qobject.h>
-#include <QtGui/qtransform.h>
-#include <QtGui/qgraphicsitem.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Gui)
-
-#if !defined(QT_NO_GRAPHICSVIEW) || (QT_EDITION & QT_MODULE_GRAPHICSVIEW) != QT_MODULE_GRAPHICSVIEW
-
-class QGraphicsSceneIndexPrivate;
-class QGraphicsScene;
-class QRectF;
-class QPointF;
-template<typename T> class QList;
-
-class Q_AUTOTEST_EXPORT QGraphicsSceneIndex: public QObject
-{
-    Q_OBJECT
-
-public:
-    QGraphicsSceneIndex(QGraphicsScene *scene = 0);
-    virtual ~QGraphicsSceneIndex();
-
-    QGraphicsScene *scene() const;
-
-    virtual QRectF indexedRect() const;
-
-    virtual QList<QGraphicsItem *> items(Qt::SortOrder order = Qt::AscendingOrder) const  = 0;
-    virtual QList<QGraphicsItem *> items(const QPointF &pos, Qt::ItemSelectionMode mode,
-                                         Qt::SortOrder order, const QTransform &deviceTransform = QTransform()) const;
-    virtual QList<QGraphicsItem *> items(const QRectF &rect, Qt::ItemSelectionMode mode,
-                                         Qt::SortOrder order, const QTransform &deviceTransform = QTransform()) const;
-    virtual QList<QGraphicsItem *> items(const QPolygonF &polygon, Qt::ItemSelectionMode mode,
-                                         Qt::SortOrder order, const QTransform &deviceTransform = QTransform()) const;
-    virtual QList<QGraphicsItem *> items(const QPainterPath &path, Qt::ItemSelectionMode mode,
-                                         Qt::SortOrder order, const QTransform &deviceTransform = QTransform()) const;
-    virtual QList<QGraphicsItem *> estimateItems(const QPointF &point,
-                                                 Qt::SortOrder order, const QTransform &deviceTransform) const;
-    virtual QList<QGraphicsItem *> estimateItems(const QRectF &rect,
-                                                 Qt::SortOrder order, const QTransform &deviceTransform) const = 0;
-
-protected:
-    virtual void clear();
-    virtual void addItem(QGraphicsItem *item) = 0;
-    virtual void removeItem(QGraphicsItem *item) = 0;
-    virtual void deleteItem(QGraphicsItem *item);
-
-    virtual void itemChange(const QGraphicsItem *item, QGraphicsItem::GraphicsItemChange, const QVariant &value);
-    virtual void prepareBoundingRectChange(const QGraphicsItem *item);
-    virtual void sceneRectChanged(const QRectF &rect);
-
-    QGraphicsSceneIndex(QObjectPrivate &dd, QGraphicsScene *scene);
-
-    friend class QGraphicsScene;
-    friend class QGraphicsScenePrivate;
-    friend class QGraphicsItem;
-    friend class QGraphicsItemPrivate;
-    friend class QGraphicsSceneBspTreeIndex;
-private:
-    Q_DISABLE_COPY(QGraphicsSceneIndex)
-    Q_DECLARE_PRIVATE(QGraphicsSceneIndex)
-};
-
-#endif // QT_NO_GRAPHICSVIEW
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QGRAPHICSSCENEINDEX_H
diff --git a/src/gui/graphicsview/qgraphicssceneindex_p.h b/src/gui/graphicsview/qgraphicssceneindex_p.h
index 576ee98..85a1140 100644
--- a/src/gui/graphicsview/qgraphicssceneindex_p.h
+++ b/src/gui/graphicsview/qgraphicssceneindex_p.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QGRAPHICSSCENEINDEX_P_H
-#define QGRAPHICSSCENEINDEX_P_H
+#ifndef QGRAPHICSSCENEINDEX_H
+#define QGRAPHICSSCENEINDEX_H
 
 //
 //  W A R N I N G
@@ -53,20 +53,77 @@
 // We mean it.
 //
 
-#include "qgraphicssceneindex.h"
-
-#if !defined(QT_NO_GRAPHICSVIEW) || (QT_EDITION & QT_MODULE_GRAPHICSVIEW) != QT_MODULE_GRAPHICSVIEW
-
+#include <QtCore/qnamespace.h>
+#include <QtCore/qobject.h>
+#include <QtGui/qtransform.h>
+#include <QtGui/qgraphicsitem.h>
 #include <private/qobject_p.h>
-#include <private/qgraphicsitem_p.h>
+
+QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Gui)
+
+#if !defined(QT_NO_GRAPHICSVIEW) || (QT_EDITION & QT_MODULE_GRAPHICSVIEW) != QT_MODULE_GRAPHICSVIEW
+
 class QGraphicsScene;
 class QGraphicsSceneIndexIntersector;
-class QGraphicsSceneIndexRectIntersector;
 class QGraphicsSceneIndexPointIntersector;
+class QGraphicsSceneIndexRectIntersector;
 class QGraphicsSceneIndexPathIntersector;
+class QGraphicsSceneIndexPrivate;
+class QPointF;
+class QRectF;
+template<typename T> class QList;
+
+class Q_AUTOTEST_EXPORT QGraphicsSceneIndex : public QObject
+{
+    Q_OBJECT
+
+public:
+    QGraphicsSceneIndex(QGraphicsScene *scene = 0);
+    virtual ~QGraphicsSceneIndex();
+
+    QGraphicsScene *scene() const;
+
+    virtual QRectF indexedRect() const;
+
+    virtual QList<QGraphicsItem *> items(Qt::SortOrder order = Qt::AscendingOrder) const  = 0;
+    virtual QList<QGraphicsItem *> items(const QPointF &pos, Qt::ItemSelectionMode mode,
+                                         Qt::SortOrder order, const QTransform &deviceTransform = QTransform()) const;
+    virtual QList<QGraphicsItem *> items(const QRectF &rect, Qt::ItemSelectionMode mode,
+                                         Qt::SortOrder order, const QTransform &deviceTransform = QTransform()) const;
+    virtual QList<QGraphicsItem *> items(const QPolygonF &polygon, Qt::ItemSelectionMode mode,
+                                         Qt::SortOrder order, const QTransform &deviceTransform = QTransform()) const;
+    virtual QList<QGraphicsItem *> items(const QPainterPath &path, Qt::ItemSelectionMode mode,
+                                         Qt::SortOrder order, const QTransform &deviceTransform = QTransform()) const;
+    virtual QList<QGraphicsItem *> estimateItems(const QPointF &point,
+                                                 Qt::SortOrder order, const QTransform &deviceTransform) const;
+    virtual QList<QGraphicsItem *> estimateItems(const QRectF &rect,
+                                                 Qt::SortOrder order, const QTransform &deviceTransform) const = 0;
+
+protected:
+    virtual void clear();
+    virtual void addItem(QGraphicsItem *item) = 0;
+    virtual void removeItem(QGraphicsItem *item) = 0;
+    virtual void deleteItem(QGraphicsItem *item);
+
+    virtual void itemChange(const QGraphicsItem *item, QGraphicsItem::GraphicsItemChange, const QVariant &value);
+    virtual void prepareBoundingRectChange(const QGraphicsItem *item);
+    virtual void sceneRectChanged(const QRectF &rect);
+
+    QGraphicsSceneIndex(QObjectPrivate &dd, QGraphicsScene *scene);
+
+    friend class QGraphicsScene;
+    friend class QGraphicsScenePrivate;
+    friend class QGraphicsItem;
+    friend class QGraphicsItemPrivate;
+    friend class QGraphicsSceneBspTreeIndex;
+private:
+    Q_DISABLE_COPY(QGraphicsSceneIndex)
+    Q_DECLARE_PRIVATE(QGraphicsSceneIndex)
+};
 
 class QGraphicsSceneIndexPrivate : public QObjectPrivate
 {
@@ -96,8 +153,10 @@ public:
                            const QTransform &transform, const QTransform &deviceTransform) const = 0;
 };
 
+#endif // QT_NO_GRAPHICSVIEW
+
 QT_END_NAMESPACE
 
-#endif // QGRAPHICSSCENEINDEX_P_H
+QT_END_HEADER
 
-#endif
+#endif // QGRAPHICSSCENEINDEX_H
diff --git a/src/gui/graphicsview/qgraphicsscenelinearindex.h b/src/gui/graphicsview/qgraphicsscenelinearindex.h
index b793d98..a5327ef 100644
--- a/src/gui/graphicsview/qgraphicsscenelinearindex.h
+++ b/src/gui/graphicsview/qgraphicsscenelinearindex.h
@@ -65,8 +65,8 @@ QT_MODULE(Gui)
 
 #include <QtCore/qrect.h>
 #include <QtCore/qlist.h>
-#include <QtGui/qgraphicssceneindex.h>
 #include <QtGui/qgraphicsitem.h>
+#include <private/qgraphicssceneindex_p.h>
 
 class Q_AUTOTEST_EXPORT QGraphicsSceneLinearIndex : public QGraphicsSceneIndex
 {