diff options
| author | Jeremy Katz <jeremy.katz@nokia.com> | 2009-09-25 14:44:15 (GMT) |
|---|---|---|
| committer | Jeremy Katz <jeremy.katz@nokia.com> | 2009-09-25 14:44:15 (GMT) |
| commit | 2c37fde6b5a503a14bb4655a785d51be77fe889b (patch) | |
| tree | fe35633047ac706f4736fc119bcd2abbb6d79d22 /src/gui/graphicsview/qgraphicssceneindex_p.h | |
| parent | 2b1f40b7dcf7ef69fe1f832ff544fcb31cf5c3a1 (diff) | |
| parent | b4c52810efd42ba9cd8087180a5bf9d48c18de84 (diff) | |
| download | Qt-2c37fde6b5a503a14bb4655a785d51be77fe889b.zip Qt-2c37fde6b5a503a14bb4655a785d51be77fe889b.tar.gz Qt-2c37fde6b5a503a14bb4655a785d51be77fe889b.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/gui/graphicsview/qgraphicssceneindex_p.h')
| -rw-r--r-- | src/gui/graphicsview/qgraphicssceneindex_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/graphicsview/qgraphicssceneindex_p.h b/src/gui/graphicsview/qgraphicssceneindex_p.h index 768c724..adebfde 100644 --- a/src/gui/graphicsview/qgraphicssceneindex_p.h +++ b/src/gui/graphicsview/qgraphicssceneindex_p.h @@ -138,7 +138,7 @@ public: void recursive_items_helper(QGraphicsItem *item, QRectF exposeRect, QGraphicsSceneIndexIntersector *intersector, QList<QGraphicsItem *> *items, const QTransform &viewTransform, - Qt::ItemSelectionMode mode, Qt::SortOrder order, qreal parentOpacity = 1.0) const; + Qt::ItemSelectionMode mode, qreal parentOpacity = 1.0) const; inline void items_helper(const QRectF &rect, QGraphicsSceneIndexIntersector *intersector, QList<QGraphicsItem *> *items, const QTransform &viewTransform, Qt::ItemSelectionMode mode, Qt::SortOrder order) const; @@ -156,7 +156,7 @@ inline void QGraphicsSceneIndexPrivate::items_helper(const QRectF &rect, QGraphi Q_Q(const QGraphicsSceneIndex); const QList<QGraphicsItem *> tli = q->estimateTopLevelItems(rect, Qt::AscendingOrder); for (int i = 0; i < tli.size(); ++i) - recursive_items_helper(tli.at(i), rect, intersector, items, viewTransform, mode, order); + recursive_items_helper(tli.at(i), rect, intersector, items, viewTransform, mode); if (order == Qt::DescendingOrder) { const int n = items->size(); for (int i = 0; i < n / 2; ++i) |