summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qdeclarativeguard_p.h
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2010-04-15 04:07:13 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2010-04-15 04:07:13 (GMT)
commita7fe2b895980ef203631d15375f175e25b9ca6a9 (patch)
treeef7a39c0380a92e6e91ab03a3404efe70885612d /src/declarative/qml/qdeclarativeguard_p.h
parenta21bd329e4ba9b0e67931ea5a635088afda58eb5 (diff)
downloadQt-a7fe2b895980ef203631d15375f175e25b9ca6a9.zip
Qt-a7fe2b895980ef203631d15375f175e25b9ca6a9.tar.gz
Qt-a7fe2b895980ef203631d15375f175e25b9ca6a9.tar.bz2
Rename the ridiculous QDeclarativeDeclarativeData -> QDeclarativeData
Diffstat (limited to 'src/declarative/qml/qdeclarativeguard_p.h')
-rw-r--r--src/declarative/qml/qdeclarativeguard_p.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/qml/qdeclarativeguard_p.h b/src/declarative/qml/qdeclarativeguard_p.h
index 747d58f..be60ce4 100644
--- a/src/declarative/qml/qdeclarativeguard_p.h
+++ b/src/declarative/qml/qdeclarativeguard_p.h
@@ -65,7 +65,7 @@ class QDeclarativeGuard
QObject *o;
QDeclarativeGuard<QObject> *next;
QDeclarativeGuard<QObject> **prev;
- friend class QDeclarativeDeclarativeData;
+ friend class QDeclarativeData;
public:
inline QDeclarativeGuard();
inline QDeclarativeGuard(T *);
@@ -99,7 +99,7 @@ QT_END_NAMESPACE
Q_DECLARE_METATYPE(QDeclarativeGuard<QObject>);
-#include "private/qdeclarativedeclarativedata_p.h"
+#include "private/qdeclarativedata_p.h"
QT_BEGIN_NAMESPACE