diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-08-10 03:44:48 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-08-10 03:44:48 (GMT) |
| commit | 12ffa33ddc725cd94662a383af6e1793049c807c (patch) | |
| tree | 8190ce28b9cc6bd23736f718ded3b59d32be80d0 /src/declarative/qml/qmlvme.cpp | |
| parent | 3ee9db1d892927522832b6bc8e1d806e27015bc4 (diff) | |
| download | Qt-12ffa33ddc725cd94662a383af6e1793049c807c.zip Qt-12ffa33ddc725cd94662a383af6e1793049c807c.tar.gz Qt-12ffa33ddc725cd94662a383af6e1793049c807c.tar.bz2 | |
Simplify QmlDeclarativeData to a single class
Diffstat (limited to 'src/declarative/qml/qmlvme.cpp')
| -rw-r--r-- | src/declarative/qml/qmlvme.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/qml/qmlvme.cpp b/src/declarative/qml/qmlvme.cpp index bf3b31a..ffe8591 100644 --- a/src/declarative/qml/qmlvme.cpp +++ b/src/declarative/qml/qmlvme.cpp @@ -111,7 +111,7 @@ QObject *QmlVME::run(QmlContext *ctxt, QmlCompiledData *comp, int start, int cou void QmlVME::runDeferred(QObject *object) { - QmlInstanceDeclarativeData *data = QmlInstanceDeclarativeData::get(object); + QmlDeclarativeData *data = QmlDeclarativeData::get(object); if (!data || !data->context || !data->deferredComponent) return; @@ -725,8 +725,8 @@ QObject *QmlVME::run(QStack<QObject *> &stack, QmlContext *ctxt, QmlCompiledData { if (instr.defer.deferCount) { QObject *target = stack.top(); - QmlInstanceDeclarativeData *data = - QmlInstanceDeclarativeData::get(target, true); + QmlDeclarativeData *data = + QmlDeclarativeData::get(target, true); comp->addref(); data->deferredComponent = comp; data->deferredIdx = ii; |