summaryrefslogtreecommitdiffstats
path: root/src/gui/graphicsview/qgraphicsscene.cpp
diff options
context:
space:
mode:
authorAlexis Menard <alexis.menard@trolltech.com>2009-04-07 18:02:09 (GMT)
committerAlexis Menard <alexis.menard@trolltech.com>2009-04-07 18:02:09 (GMT)
commita7f4886b896751ed52db474514a2c4244ed6fc14 (patch)
treee393ef9fc621e65134cf82c0c39b299c66f913e6 /src/gui/graphicsview/qgraphicsscene.cpp
parent030554d7527663bd389b681f2e2c7e8262517013 (diff)
downloadQt-a7f4886b896751ed52db474514a2c4244ed6fc14.zip
Qt-a7f4886b896751ed52db474514a2c4244ed6fc14.tar.gz
Qt-a7f4886b896751ed52db474514a2c4244ed6fc14.tar.bz2
Fixes: Some modifications after a talk with Ariya
Diffstat (limited to 'src/gui/graphicsview/qgraphicsscene.cpp')
-rw-r--r--src/gui/graphicsview/qgraphicsscene.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp
index e74ae3a..fc9590f 100644
--- a/src/gui/graphicsview/qgraphicsscene.cpp
+++ b/src/gui/graphicsview/qgraphicsscene.cpp
@@ -491,7 +491,7 @@ void QGraphicsScenePrivate::removeFromIndex(QGraphicsItem *item)
void QGraphicsScenePrivate::resetIndex()
{
purgeRemovedItems();
- if (indexMethod == QGraphicsScene::BspTreeIndex) {
+ if (indexMethod != QGraphicsScene::NoIndex) {
for (int i = 0; i < indexedItems.size(); ++i) {
if (QGraphicsItem *item = indexedItems.at(i)) {
item->d_ptr->index = -1;
@@ -2393,12 +2393,13 @@ void QGraphicsScene::setSceneIndex(QGraphicsSceneIndex *index)
} else {
d->indexMethod = CustomIndex;
d->customIndex = index;
+ index->mscene = this;
}
}
-QGraphicsSceneIndex* QGraphicsScene::sceneIndex()
+QGraphicsSceneIndex* QGraphicsScene::sceneIndex() const
{
- Q_D(QGraphicsScene);
+ Q_D(const QGraphicsScene);
return d->customIndex;
}