summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexis Menard <alexis.menard@trolltech.com>2009-04-07 18:11:32 (GMT)
committerAlexis Menard <alexis.menard@trolltech.com>2009-04-07 18:11:32 (GMT)
commit45c70c9834316f39a939b87450099560fd286a6e (patch)
tree0c19c8c0d0afb0a23b0a030ea4865b2526443e9f
parente2e30d5c0ca99a47cc142465436d5e0a3f616b82 (diff)
downloadQt-45c70c9834316f39a939b87450099560fd286a6e.zip
Qt-45c70c9834316f39a939b87450099560fd286a6e.tar.gz
Qt-45c70c9834316f39a939b87450099560fd286a6e.tar.bz2
Fixes: Default implementation for QGraphicsSceneIndex::removeItems and QGraphicsSceneIndex::insertItems
-rw-r--r--src/gui/graphicsview/qgraphicsscene_bsp.cpp7
-rw-r--r--src/gui/graphicsview/qgraphicsscene_bsp_p.h1
-rw-r--r--src/gui/graphicsview/qgraphicssceneindex.cpp13
-rw-r--r--src/gui/graphicsview/qgraphicssceneindex.h5
4 files changed, 16 insertions, 10 deletions
diff --git a/src/gui/graphicsview/qgraphicsscene_bsp.cpp b/src/gui/graphicsview/qgraphicsscene_bsp.cpp
index c295cb3..bf95893 100644
--- a/src/gui/graphicsview/qgraphicsscene_bsp.cpp
+++ b/src/gui/graphicsview/qgraphicsscene_bsp.cpp
@@ -133,13 +133,6 @@ void QGraphicsSceneBspTree::insertItem(QGraphicsItem *item)
climbTree(insertVisitor, item->sceneBoundingRect());
}
-void QGraphicsSceneBspTree::insertItems(const QList<QGraphicsItem *> &items)
-{
- foreach(QGraphicsItem *item, items) {
- insertItem(item);
- }
-}
-
void QGraphicsSceneBspTree::removeItem(QGraphicsItem *item)
{
removeVisitor->item = item;
diff --git a/src/gui/graphicsview/qgraphicsscene_bsp_p.h b/src/gui/graphicsview/qgraphicsscene_bsp_p.h
index 4114b3b..a35148c 100644
--- a/src/gui/graphicsview/qgraphicsscene_bsp_p.h
+++ b/src/gui/graphicsview/qgraphicsscene_bsp_p.h
@@ -92,7 +92,6 @@ public:
void setRect(const QRectF &rect);
void insertItem(QGraphicsItem *item);
- void insertItems(const QList<QGraphicsItem *> &items);
void removeItem(QGraphicsItem *item);
void removeItems(const QList<QGraphicsItem *> &items);
diff --git a/src/gui/graphicsview/qgraphicssceneindex.cpp b/src/gui/graphicsview/qgraphicssceneindex.cpp
index 7868388..d8c28ed 100644
--- a/src/gui/graphicsview/qgraphicssceneindex.cpp
+++ b/src/gui/graphicsview/qgraphicssceneindex.cpp
@@ -60,6 +60,19 @@ QGraphicsScene* QGraphicsSceneIndex::scene()
return mscene;
}
+void QGraphicsSceneIndex::insertItems(const QList<QGraphicsItem *> &items)
+{
+ foreach (QGraphicsItem *item, items)
+ insertItem(item);
+}
+
+void QGraphicsSceneIndex::removeItems(const QList<QGraphicsItem *> &items)
+{
+ foreach (QGraphicsItem *item, items)
+ removeItem(item);
+}
+
+
QT_END_NAMESPACE
//#include "moc_qgraphicssceneindex.cpp"
diff --git a/src/gui/graphicsview/qgraphicssceneindex.h b/src/gui/graphicsview/qgraphicssceneindex.h
index bda6f5e..df398ae 100644
--- a/src/gui/graphicsview/qgraphicssceneindex.h
+++ b/src/gui/graphicsview/qgraphicssceneindex.h
@@ -69,9 +69,10 @@ public:
virtual void clear() = 0;
virtual void insertItem(QGraphicsItem *item) = 0;
- virtual void insertItems(const QList<QGraphicsItem *> &items) = 0;
virtual void removeItem(QGraphicsItem *item) = 0;
- virtual void removeItems(const QList<QGraphicsItem *> &items) = 0;
+
+ virtual void insertItems(const QList<QGraphicsItem *> &items);
+ virtual void removeItems(const QList<QGraphicsItem *> &items);
virtual QList<QGraphicsItem *> items(const QRectF &rect) = 0;