Remove the indexing (BSP) logic from the scene

We basically add a new index that implement the old BSP logic but in a
separate class instead of living into the QGraphicsScene. It will be
much more easier to add a new index method or for people to use their
own

Conflicts:

	src/gui/graphicsview/qgraphicsitem.cpp
	src/gui/graphicsview/qgraphicssceneindex.h

1 files changed, 3 insertions, 7 deletions

diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp
index b8ff5b4..4574334 100644
--- a/src/gui/graphicsview/qgraphicsitem.cpp
+++ b/src/gui/graphicsview/qgraphicsitem.cpp
@@ -5789,7 +5789,7 @@ void QGraphicsItem::addToIndex()
         return;
     }
     if (d_ptr->scene)
-        d_ptr->scene->d_func()->addToIndex(this);
+        d_ptr->scene->d_func()->index->insertItem(this);
     d_ptr->updateHelper();
 }
 
@@ -5802,13 +5802,9 @@ void QGraphicsItem::addToIndex()
 */
 void QGraphicsItem::removeFromIndex()
 {
-    if (d_ptr->ancestorFlags & QGraphicsItemPrivate::AncestorClipsChildren) {
-        // ### remove from child index only if applicable
-        return;
-    }
     d_ptr->updateHelper();
     if (d_ptr->scene)
-        d_ptr->scene->d_func()->removeFromIndex(this);
+        d_ptr->scene->d_func()->index->removeItem(this,false);
 }
 
 /*!
@@ -5831,7 +5827,7 @@ void QGraphicsItem::prepareGeometryChange()
 
     d_ptr->updateHelper(QRectF(), false, /*maybeDirtyClipPath=*/!d_ptr->inSetPosHelper);
     QGraphicsScenePrivate *scenePrivate = d_ptr->scene->d_func();
-    scenePrivate->removeFromIndex(this);
+    scenePrivate->index->updateItem(this);
 
     if (d_ptr->inSetPosHelper)
         return;