Changes after first round of code reviewing.

This change removes all code that handles ItemIgnoresTransformations
from QGraphicsView, and changes the APIs of the scene index intersectors.

Reviewed-by: Alexis

1 files changed, 9 insertions, 10 deletions

diff --git a/src/gui/graphicsview/qgraphicssceneindex_p.h b/src/gui/graphicsview/qgraphicssceneindex_p.h
index d0d181b..576ee98 100644
--- a/src/gui/graphicsview/qgraphicssceneindex_p.h
+++ b/src/gui/graphicsview/qgraphicssceneindex_p.h
@@ -75,9 +75,12 @@ public:
     QGraphicsSceneIndexPrivate(QGraphicsScene *scene);
     ~QGraphicsSceneIndexPrivate();
 
-    void recursive_items_helper(QGraphicsItem *item, QGraphicsSceneIndexIntersector *intersector, QList<QGraphicsItem *> *items,
-                           const QTransform &parentTransform, const QTransform &viewTransform,
-                           Qt::ItemSelectionMode mode, Qt::SortOrder order, qreal parentOpacity = 1.0) const;
+    static bool itemCollidesWithPath(const QGraphicsItem *item, const QPainterPath &path, Qt::ItemSelectionMode mode);
+
+    void recursive_items_helper(QGraphicsItem *item, QRectF exposeRect,
+                                QGraphicsSceneIndexIntersector *intersector, QList<QGraphicsItem *> *items,
+                                const QTransform &parentTransform, const QTransform &viewTransform,
+                                Qt::ItemSelectionMode mode, Qt::SortOrder order, qreal parentOpacity = 1.0) const;
    QGraphicsScene *scene;
    QGraphicsSceneIndexPointIntersector *pointIntersector;
    QGraphicsSceneIndexRectIntersector *rectIntersector;
@@ -87,14 +90,10 @@ public:
 class QGraphicsSceneIndexIntersector
 {
 public:
-    QGraphicsSceneIndexIntersector(QGraphicsScene *scene) : scene(scene) { }
+    QGraphicsSceneIndexIntersector() { }
     virtual ~QGraphicsSceneIndexIntersector() { }
-    virtual bool intersect(const QRectF &rect) const = 0;
-    Qt::ItemSelectionMode mode;
-    QGraphicsItem *item;
-    QGraphicsScene *scene;
-    QRectF rect;
-    QTransform transform;
+    virtual bool intersect(const QGraphicsItem *item, const QRectF &exposeRect, Qt::ItemSelectionMode mode,
+                           const QTransform &transform, const QTransform &deviceTransform) const = 0;
 };
 
 QT_END_NAMESPACE