diff options
author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-04-15 04:07:13 (GMT) |
---|---|---|
committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-04-15 04:07:13 (GMT) |
commit | a7fe2b895980ef203631d15375f175e25b9ca6a9 (patch) | |
tree | ef7a39c0380a92e6e91ab03a3404efe70885612d /src/declarative/qml/qdeclarativecomponent.cpp | |
parent | a21bd329e4ba9b0e67931ea5a635088afda58eb5 (diff) | |
download | Qt-a7fe2b895980ef203631d15375f175e25b9ca6a9.zip Qt-a7fe2b895980ef203631d15375f175e25b9ca6a9.tar.gz Qt-a7fe2b895980ef203631d15375f175e25b9ca6a9.tar.bz2 |
Rename the ridiculous QDeclarativeDeclarativeData -> QDeclarativeData
Diffstat (limited to 'src/declarative/qml/qdeclarativecomponent.cpp')
-rw-r--r-- | src/declarative/qml/qdeclarativecomponent.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/qml/qdeclarativecomponent.cpp b/src/declarative/qml/qdeclarativecomponent.cpp index 5f26ad5..1903006 100644 --- a/src/declarative/qml/qdeclarativecomponent.cpp +++ b/src/declarative/qml/qdeclarativecomponent.cpp @@ -518,7 +518,7 @@ QScriptValue QDeclarativeComponent::createObject() if (!ret) return QScriptValue(); QDeclarativeEnginePrivate *priv = QDeclarativeEnginePrivate::get(d->engine); - QDeclarativeDeclarativeData::get(ret, true)->setImplicitDestructible(); + QDeclarativeData::get(ret, true)->setImplicitDestructible(); return priv->objectClass->newQObject(ret, QMetaType::QObjectStar); } @@ -581,7 +581,7 @@ QObject *QDeclarativeComponent::beginCreate(QDeclarativeContext *context) Q_D(QDeclarativeComponent); QObject *rv = d->beginCreate(context?QDeclarativeContextData::get(context):0, QBitField()); if (rv) { - QDeclarativeDeclarativeData *ddata = QDeclarativeDeclarativeData::get(rv); + QDeclarativeData *ddata = QDeclarativeData::get(rv); Q_ASSERT(ddata); ddata->indestructible = true; } |