diff options
| author | Ariya Hidayat <ariya.hidayat@trolltech.com> | 2009-03-18 19:16:55 (GMT) |
|---|---|---|
| committer | Alexis Menard <alexis.menard@trolltech.com> | 2009-04-07 18:23:47 (GMT) |
| commit | 31bba59443638a2f97f330a9b64ded261b060701 (patch) | |
| tree | 1bc3c92bc8df55141197dd426a182f5435c62b0a | |
| parent | dfd72ab3c8e519f2c08b9a85e1309f8e06a5dd45 (diff) | |
| download | Qt-31bba59443638a2f97f330a9b64ded261b060701.zip Qt-31bba59443638a2f97f330a9b64ded261b060701.tar.gz Qt-31bba59443638a2f97f330a9b64ded261b060701.tar.bz2 | |
Fixes: Own our internal scene index so we do not need to explicitly delete it.
| -rw-r--r-- | src/gui/graphicsview/qgraphicsscene.cpp | 7 | ||||
| -rw-r--r-- | src/gui/graphicsview/qgraphicsscene_p.h | 1 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp index dd67067..d4fcbd0 100644 --- a/src/gui/graphicsview/qgraphicsscene.cpp +++ b/src/gui/graphicsview/qgraphicsscene.cpp @@ -361,10 +361,7 @@ QGraphicsScenePrivate::QGraphicsScenePrivate() style(0) { } -QGraphicsScenePrivate::~QGraphicsScenePrivate() -{ - delete index; -} + /*! \internal */ @@ -372,6 +369,8 @@ void QGraphicsScenePrivate::init() { Q_Q(QGraphicsScene); + index->setParent(q); + // Keep this index so we can check for connected slots later on. changedSignalMask = (1 << q->metaObject()->indexOfSignal("changed(QList<QRectF>)")); qApp->d_func()->scene_list.append(q); diff --git a/src/gui/graphicsview/qgraphicsscene_p.h b/src/gui/graphicsview/qgraphicsscene_p.h index b06db38..7e311ee 100644 --- a/src/gui/graphicsview/qgraphicsscene_p.h +++ b/src/gui/graphicsview/qgraphicsscene_p.h @@ -81,7 +81,6 @@ class QGraphicsScenePrivate : public QObjectPrivate Q_DECLARE_PUBLIC(QGraphicsScene) public: QGraphicsScenePrivate(); - ~QGraphicsScenePrivate(); void init(); quint32 changedSignalMask; |