Rename QDeclarativeData -> QAbstractDeclarativeData

Reviewed-by: Martin Jones

2 files changed, 7 insertions, 7 deletions

diff --git a/src/declarative/qml/qdeclarativedeclarativedata_p.h b/src/declarative/qml/qdeclarativedeclarativedata_p.h
index 5b12629..fdc51a4 100644
--- a/src/declarative/qml/qdeclarativedeclarativedata_p.h
+++ b/src/declarative/qml/qdeclarativedeclarativedata_p.h
@@ -68,7 +68,7 @@ class QDeclarativeContextData;
 // default state for elemental object allocations.  This is crucial in the
 // workings of the QDeclarativeInstruction::CreateSimpleObject instruction.
 // Don't change anything here without first considering that case!
-class Q_AUTOTEST_EXPORT QDeclarativeDeclarativeData : public QDeclarativeData
+class Q_AUTOTEST_EXPORT QDeclarativeDeclarativeData : public QAbstractDeclarativeData
 {
 public:
     QDeclarativeDeclarativeData()
@@ -80,12 +80,12 @@ public:
       }
 
     static inline void init() {
-        QDeclarativeData::destroyed = destroyed;
-        QDeclarativeData::parentChanged = parentChanged;
+        QAbstractDeclarativeData::destroyed = destroyed;
+        QAbstractDeclarativeData::parentChanged = parentChanged;
     }
 
-    static void destroyed(QDeclarativeData *, QObject *);
-    static void parentChanged(QDeclarativeData *, QObject *, QObject *);
+    static void destroyed(QAbstractDeclarativeData *, QObject *);
+    static void parentChanged(QAbstractDeclarativeData *, QObject *, QObject *);
 
     void destroyed(QObject *);
     void parentChanged(QObject *, QObject *);
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index 85e8a9e..eb149b1 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -354,12 +354,12 @@ void QDeclarativePrivate::qdeclarativeelement_destructor(QObject *)
 {
 }
 
-void QDeclarativeDeclarativeData::destroyed(QDeclarativeData *d, QObject *o)
+void QDeclarativeDeclarativeData::destroyed(QAbstractDeclarativeData *d, QObject *o)
 {
     static_cast<QDeclarativeDeclarativeData *>(d)->destroyed(o);
 }
 
-void QDeclarativeDeclarativeData::parentChanged(QDeclarativeData *d, QObject *o, QObject *p)
+void QDeclarativeDeclarativeData::parentChanged(QAbstractDeclarativeData *d, QObject *o, QObject *p)
 {
     static_cast<QDeclarativeDeclarativeData *>(d)->parentChanged(o, p);
 }