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

We'll keep this as private API for now.

Reviewed-by: Alexis

5 files changed, 61 insertions, 137 deletions

diff --git a/src/gui/graphicsview/graphicsview.pri b/src/gui/graphicsview/graphicsview.pri
index 5981ce5..0c0747e 100644
--- a/src/gui/graphicsview/graphicsview.pri
+++ b/src/gui/graphicsview/graphicsview.pri
@@ -12,7 +12,6 @@ HEADERS += graphicsview/qgraphicsgridlayout.h \
     graphicsview/qgraphicsscene.h \
     graphicsview/qgraphicsscene_bsp_p.h \
     graphicsview/qgraphicsscene_p.h \
-    graphicsview/qgraphicsscenebsptreeindex.h \
     graphicsview/qgraphicsscenebsptreeindex_p.h \
     graphicsview/qgraphicssceneevent.h \
     graphicsview/qgraphicssceneindex_p.h \
diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp
index e004917..28dd3be 100644
--- a/src/gui/graphicsview/qgraphicsscene.cpp
+++ b/src/gui/graphicsview/qgraphicsscene.cpp
@@ -217,7 +217,7 @@
 #include "qgraphicsview_p.h"
 #include "qgraphicswidget.h"
 #include "qgraphicswidget_p.h"
-#include "qgraphicsscenebsptreeindex.h"
+#include <private/qgraphicsscenebsptreeindex_p.h>
 #include <private/qgraphicsscenelinearindex_p.h>
 
 #include <QtCore/qdebug.h>
diff --git a/src/gui/graphicsview/qgraphicsscenebsptreeindex.cpp b/src/gui/graphicsview/qgraphicsscenebsptreeindex.cpp
index 54bf09b..27b5514 100644
--- a/src/gui/graphicsview/qgraphicsscenebsptreeindex.cpp
+++ b/src/gui/graphicsview/qgraphicsscenebsptreeindex.cpp
@@ -75,14 +75,10 @@
     \sa QGraphicsScene, QGraphicsView, QGraphicsSceneIndex
 */
 
-#include "qgraphicsscenebsptreeindex.h"
-
 #ifndef QT_NO_GRAPHICSVIEW
 
-#include "qgraphicsscenebsptreeindex_p.h"
-#include "qgraphicsitem_p.h"
-#include "qgraphicsscene_p.h"
-
+#include <private/qgraphicsscene_p.h>
+#include <private/qgraphicsscenebsptreeindex_p.h>
 #include <private/qgraphicssceneindex_p.h>
 
 #include <QtCore/qmath.h>
@@ -783,7 +779,7 @@ bool QGraphicsSceneBspTreeIndex::event(QEvent *event)
 
 QT_END_NAMESPACE
 
-#include "moc_qgraphicsscenebsptreeindex.cpp"
+#include "moc_qgraphicsscenebsptreeindex_p.cpp"
 
 #endif  // QT_NO_GRAPHICSVIEW
 
diff --git a/src/gui/graphicsview/qgraphicsscenebsptreeindex.h b/src/gui/graphicsview/qgraphicsscenebsptreeindex.h
deleted file mode 100644
index f3c77d3..0000000
--- a/src/gui/graphicsview/qgraphicsscenebsptreeindex.h
+++ /dev/null
@@ -1,119 +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$
-**
-****************************************************************************/
-
-#include <QtCore/qglobal.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.
-//
-
-#ifndef QGRAPHICSBSPTREEINDEX_H
-#define QGRAPHICSBSPTREEINDEX_H
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Gui)
-
-#if !defined(QT_NO_GRAPHICSVIEW) || (QT_EDITION & QT_MODULE_GRAPHICSVIEW) != QT_MODULE_GRAPHICSVIEW
-
-#include <QtCore/qrect.h>
-#include <QtCore/qlist.h>
-#include <QtGui/qgraphicsitem.h>
-#include <QtGui/qgraphicsscene.h>
-#include <private/qgraphicssceneindex_p.h>
-
-#include "qgraphicsscene_bsp_p.h"
-
-class QGraphicsSceneBspTreeIndexPrivate;
-
-class Q_AUTOTEST_EXPORT QGraphicsSceneBspTreeIndex : public QGraphicsSceneIndex
-{
-    Q_OBJECT
-    Q_PROPERTY(int bspTreeDepth READ bspTreeDepth WRITE setBspTreeDepth)
-public:
-    QGraphicsSceneBspTreeIndex(QGraphicsScene *scene = 0);
-    QRectF indexedRect() const;
-
-    QList<QGraphicsItem *> estimateItems(const QRectF &rect, Qt::SortOrder order, const QTransform &deviceTransform) const;
-
-    QList<QGraphicsItem *> items(Qt::SortOrder order = Qt::AscendingOrder) const;
-
-    int bspTreeDepth();
-    void setBspTreeDepth(int depth);
-
-protected:
-    bool event(QEvent *event);
-    void clear();
-
-    void addItem(QGraphicsItem *item);
-    void removeItem(QGraphicsItem *item);
-    void deleteItem(QGraphicsItem *item);
-    void prepareBoundingRectChange(const QGraphicsItem *item);
-
-    void sceneRectChanged(const QRectF &rect);
-    void itemChange(const QGraphicsItem *item, QGraphicsItem::GraphicsItemChange change, const QVariant &value);
-
-private :
-    Q_DECLARE_PRIVATE(QGraphicsSceneBspTreeIndex)
-    Q_DISABLE_COPY(QGraphicsSceneBspTreeIndex)
-    Q_PRIVATE_SLOT(d_func(), void _q_updateSortCache())
-    Q_PRIVATE_SLOT(d_func(), void _q_updateIndex())
-
-    friend class QGraphicsScene;
-    friend class QGraphicsScenePrivate;
-};
-
-#endif // QT_NO_GRAPHICSVIEW
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QGRAPHICSBSPTREEINDEX_H
diff --git a/src/gui/graphicsview/qgraphicsscenebsptreeindex_p.h b/src/gui/graphicsview/qgraphicsscenebsptreeindex_p.h
index ed12fac..1e4234e 100644
--- a/src/gui/graphicsview/qgraphicsscenebsptreeindex_p.h
+++ b/src/gui/graphicsview/qgraphicsscenebsptreeindex_p.h
@@ -39,8 +39,7 @@
 **
 ****************************************************************************/
 
-#ifndef QGRAPHICSSCENEBSPTREEINDEX_P_H
-#define QGRAPHICSSCENEBSPTREEINDEX_P_H
+#include <QtCore/qglobal.h>
 
 //
 //  W A R N I N G
@@ -53,18 +52,66 @@
 // We mean it.
 //
 
-#include "qgraphicsscenebsptreeindex.h"
+#ifndef QGRAPHICSBSPTREEINDEX_H
+#define QGRAPHICSBSPTREEINDEX_H
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Gui)
 
 #if !defined(QT_NO_GRAPHICSVIEW) || (QT_EDITION & QT_MODULE_GRAPHICSVIEW) != QT_MODULE_GRAPHICSVIEW
 
-#include <private/qgraphicssceneindex_p.h>
+#include <QtCore/qrect.h>
+#include <QtCore/qlist.h>
+#include <QtGui/qgraphicsitem.h>
+#include <QtGui/qgraphicsscene.h>
 #include <private/qgraphicsitem_p.h>
-
-QT_BEGIN_NAMESPACE
+#include <private/qgraphicssceneindex_p.h>
+#include <private/qgraphicsscene_bsp_p.h>
 
 static const int QGRAPHICSSCENE_INDEXTIMER_TIMEOUT = 2000;
 
 class QGraphicsScene;
+class QGraphicsSceneBspTreeIndexPrivate;
+
+class Q_AUTOTEST_EXPORT QGraphicsSceneBspTreeIndex : public QGraphicsSceneIndex
+{
+    Q_OBJECT
+    Q_PROPERTY(int bspTreeDepth READ bspTreeDepth WRITE setBspTreeDepth)
+public:
+    QGraphicsSceneBspTreeIndex(QGraphicsScene *scene = 0);
+    QRectF indexedRect() const;
+
+    QList<QGraphicsItem *> estimateItems(const QRectF &rect, Qt::SortOrder order, const QTransform &deviceTransform) const;
+
+    QList<QGraphicsItem *> items(Qt::SortOrder order = Qt::AscendingOrder) const;
+
+    int bspTreeDepth();
+    void setBspTreeDepth(int depth);
+
+protected:
+    bool event(QEvent *event);
+    void clear();
+
+    void addItem(QGraphicsItem *item);
+    void removeItem(QGraphicsItem *item);
+    void deleteItem(QGraphicsItem *item);
+    void prepareBoundingRectChange(const QGraphicsItem *item);
+
+    void sceneRectChanged(const QRectF &rect);
+    void itemChange(const QGraphicsItem *item, QGraphicsItem::GraphicsItemChange change, const QVariant &value);
+
+private :
+    Q_DECLARE_PRIVATE(QGraphicsSceneBspTreeIndex)
+    Q_DISABLE_COPY(QGraphicsSceneBspTreeIndex)
+    Q_PRIVATE_SLOT(d_func(), void _q_updateSortCache())
+    Q_PRIVATE_SLOT(d_func(), void _q_updateIndex())
+
+    friend class QGraphicsScene;
+    friend class QGraphicsScenePrivate;
+};
 
 class QGraphicsSceneBspTreeIndexPrivate : public QGraphicsSceneIndexPrivate
 {
@@ -183,9 +230,10 @@ static inline bool QRectF_intersects(const QRectF &s, const QRectF &r)
     return !(t1 >= b2 || t2 >= b1);
 }
 
-QT_END_NAMESPACE
+#endif // QT_NO_GRAPHICSVIEW
 
-#endif // QGRAPHICSSCENEBSPTREEINDEX_P_H
+QT_END_NAMESPACE
 
-#endif
+QT_END_HEADER
 
+#endif // QGRAPHICSBSPTREEINDEX_H