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/qdeclarativecontext_p.h | |
| 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/qdeclarativecontext_p.h')
| -rw-r--r-- | src/declarative/qml/qdeclarativecontext_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/qml/qdeclarativecontext_p.h b/src/declarative/qml/qdeclarativecontext_p.h index 7a16179..5d26e7e 100644 --- a/src/declarative/qml/qdeclarativecontext_p.h +++ b/src/declarative/qml/qdeclarativecontext_p.h @@ -55,7 +55,7 @@ #include "qdeclarativecontext.h" -#include "private/qdeclarativedeclarativedata_p.h" +#include "private/qdeclarativedata_p.h" #include "private/qdeclarativeintegercache_p.h" #include "private/qdeclarativetypenamecache_p.h" #include "private/qdeclarativenotifier_p.h" @@ -166,7 +166,7 @@ public: QDeclarativeAbstractExpression *expressions; // Doubly-linked list of objects that are owned by this context - QDeclarativeDeclarativeData *contextObjects; + QDeclarativeData *contextObjects; // Doubly-linked list of context guards (XXX merge with contextObjects) QDeclarativeGuardedContextData *contextGuards; |