diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-04-15 03:45:43 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-04-15 03:49:01 (GMT) |
| commit | a21bd329e4ba9b0e67931ea5a635088afda58eb5 (patch) | |
| tree | f0abb5a2fe7b92e9d8c0a076c613fc5903e7380b /src/gui | |
| parent | 43b2d65dddaf0dacdd998ceb93f923deafc466d1 (diff) | |
| download | Qt-a21bd329e4ba9b0e67931ea5a635088afda58eb5.zip Qt-a21bd329e4ba9b0e67931ea5a635088afda58eb5.tar.gz Qt-a21bd329e4ba9b0e67931ea5a635088afda58eb5.tar.bz2 | |
Rename QDeclarativeData -> QAbstractDeclarativeData
Reviewed-by: Martin Jones
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsitem.cpp | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qwidget.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index 9e0ec2e..9759b39 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -1413,7 +1413,7 @@ QGraphicsItem::~QGraphicsItem() QObjectPrivate *p = QObjectPrivate::get(o); p->wasDeleted = true; if (p->declarativeData) { - QDeclarativeData::destroyed(p->declarativeData, o); + QAbstractDeclarativeData::destroyed(p->declarativeData, o); p->declarativeData = 0; } } diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp index 4fba8cf..10fa4b9 100644 --- a/src/gui/kernel/qwidget.cpp +++ b/src/gui/kernel/qwidget.cpp @@ -1478,7 +1478,7 @@ QWidget::~QWidget() QObjectPrivate::clearGuards(this); if (d->declarativeData) { - QDeclarativeData::destroyed(d->declarativeData, this); + QAbstractDeclarativeData::destroyed(d->declarativeData, this); d->declarativeData = 0; // don't activate again in ~QObject } |