summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAriya Hidayat <ariya.hidayat@trolltech.com>2009-03-18 15:33:03 (GMT)
committerAlexis Menard <alexis.menard@trolltech.com>2009-04-07 18:22:08 (GMT)
commit76b8d22cee1d0a12de30f2c9d49ead5625b5122f (patch)
treea782ae78a76acc3ce46347638d836744a07134e3
parent875d5f41b1a796d91a4a8edac6c23a7965395470 (diff)
downloadQt-76b8d22cee1d0a12de30f2c9d49ead5625b5122f.zip
Qt-76b8d22cee1d0a12de30f2c9d49ead5625b5122f.tar.gz
Qt-76b8d22cee1d0a12de30f2c9d49ead5625b5122f.tar.bz2
Fixes: QGraphicsSceneIndex now inherits from QObject
-rw-r--r--src/gui/graphicsview/qgraphicsscene_bsp.cpp4
-rw-r--r--src/gui/graphicsview/qgraphicsscene_bsp_p.h4
-rw-r--r--src/gui/graphicsview/qgraphicsscene_linear_p.h4
-rw-r--r--src/gui/graphicsview/qgraphicssceneindex.cpp4
-rw-r--r--src/gui/graphicsview/qgraphicssceneindex.h7
5 files changed, 15 insertions, 8 deletions
diff --git a/src/gui/graphicsview/qgraphicsscene_bsp.cpp b/src/gui/graphicsview/qgraphicsscene_bsp.cpp
index b73cba2..29c54bb 100644
--- a/src/gui/graphicsview/qgraphicsscene_bsp.cpp
+++ b/src/gui/graphicsview/qgraphicsscene_bsp.cpp
@@ -83,8 +83,8 @@ public:
}
};
-QGraphicsSceneBspTree::QGraphicsSceneBspTree()
- : leafCnt(0)
+QGraphicsSceneBspTree::QGraphicsSceneBspTree(QObject *parent)
+ : QGraphicsSceneIndex(parent), leafCnt(0)
{
insertVisitor = new QGraphicsSceneInsertItemBspTreeVisitor;
removeVisitor = new QGraphicsSceneRemoveItemBspTreeVisitor;
diff --git a/src/gui/graphicsview/qgraphicsscene_bsp_p.h b/src/gui/graphicsview/qgraphicsscene_bsp_p.h
index ed207ea..8b7d753 100644
--- a/src/gui/graphicsview/qgraphicsscene_bsp_p.h
+++ b/src/gui/graphicsview/qgraphicsscene_bsp_p.h
@@ -72,6 +72,8 @@ class QGraphicsSceneFindItemBspTreeVisitor;
class Q_AUTOTEST_EXPORT QGraphicsSceneBspTree : public QGraphicsSceneIndex
{
+ Q_OBJECT
+
public:
struct Node
{
@@ -83,7 +85,7 @@ public:
Type type;
};
- QGraphicsSceneBspTree();
+ QGraphicsSceneBspTree(QObject *parent = 0);
~QGraphicsSceneBspTree();
void initialize(const QRectF &rect, int depth);
diff --git a/src/gui/graphicsview/qgraphicsscene_linear_p.h b/src/gui/graphicsview/qgraphicsscene_linear_p.h
index 1981b17..4871b2c 100644
--- a/src/gui/graphicsview/qgraphicsscene_linear_p.h
+++ b/src/gui/graphicsview/qgraphicsscene_linear_p.h
@@ -66,12 +66,14 @@ QT_BEGIN_NAMESPACE
class Q_AUTOTEST_EXPORT QGraphicsSceneLinearIndex : public QGraphicsSceneIndex
{
+ Q_OBJECT
+
private:
QRectF m_sceneRect;
QList<QGraphicsItem*> m_items;
public:
- QGraphicsSceneLinearIndex(): QGraphicsSceneIndex() {
+ QGraphicsSceneLinearIndex(QObject *parent = 0): QGraphicsSceneIndex(parent) {
}
virtual void setRect(const QRectF &rect) {
diff --git a/src/gui/graphicsview/qgraphicssceneindex.cpp b/src/gui/graphicsview/qgraphicssceneindex.cpp
index 99d1b3b..904e0af 100644
--- a/src/gui/graphicsview/qgraphicssceneindex.cpp
+++ b/src/gui/graphicsview/qgraphicssceneindex.cpp
@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
/*!
Constructs an abstract scene index.
*/
-QGraphicsSceneIndex::QGraphicsSceneIndex()
+QGraphicsSceneIndex::QGraphicsSceneIndex(QObject *parent): QObject(parent)
{
}
@@ -166,6 +166,6 @@ void QGraphicsSceneIndex::updateItems(const QList<QGraphicsItem *> &items)
QT_END_NAMESPACE
-//#include "moc_qgraphicssceneindex.cpp"
+#include "moc_qgraphicssceneindex.cpp"
#endif // QT_NO_GRAPHICSVIEW
diff --git a/src/gui/graphicsview/qgraphicssceneindex.h b/src/gui/graphicsview/qgraphicssceneindex.h
index f78672f..d3b6c9f 100644
--- a/src/gui/graphicsview/qgraphicssceneindex.h
+++ b/src/gui/graphicsview/qgraphicssceneindex.h
@@ -43,6 +43,7 @@
#define QGRAPHICSSCENEINDEX_H
#include <QtCore/qnamespace.h>
+#include <QtCore/qobject.h>
QT_BEGIN_HEADER
@@ -58,10 +59,12 @@ class QRectF;
class QPointF;
template<typename T> class QList;
-class Q_GUI_EXPORT QGraphicsSceneIndex
+class Q_GUI_EXPORT QGraphicsSceneIndex: public QObject
{
+ Q_OBJECT
+
public:
- QGraphicsSceneIndex();
+ QGraphicsSceneIndex(QObject *parent = 0);
virtual ~QGraphicsSceneIndex();
virtual void setRect(const QRectF &rect) = 0;