summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel/qobject.cpp
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2010-04-15 03:45:43 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2010-04-15 03:49:01 (GMT)
commita21bd329e4ba9b0e67931ea5a635088afda58eb5 (patch)
treef0abb5a2fe7b92e9d8c0a076c613fc5903e7380b /src/corelib/kernel/qobject.cpp
parent43b2d65dddaf0dacdd998ceb93f923deafc466d1 (diff)
downloadQt-a21bd329e4ba9b0e67931ea5a635088afda58eb5.zip
Qt-a21bd329e4ba9b0e67931ea5a635088afda58eb5.tar.gz
Qt-a21bd329e4ba9b0e67931ea5a635088afda58eb5.tar.bz2
Rename QDeclarativeData -> QAbstractDeclarativeData
Reviewed-by: Martin Jones
Diffstat (limited to 'src/corelib/kernel/qobject.cpp')
-rw-r--r--src/corelib/kernel/qobject.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index 411f22e..c13d829 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -125,8 +125,8 @@ extern "C" Q_CORE_EXPORT void qt_removeObject(QObject *)
}
}
-void (*QDeclarativeData::destroyed)(QDeclarativeData *, QObject *) = 0;
-void (*QDeclarativeData::parentChanged)(QDeclarativeData *, QObject *, QObject *) = 0;
+void (*QAbstractDeclarativeData::destroyed)(QAbstractDeclarativeData *, QObject *) = 0;
+void (*QAbstractDeclarativeData::parentChanged)(QAbstractDeclarativeData *, QObject *, QObject *) = 0;
QObjectData::~QObjectData() {}
@@ -878,7 +878,7 @@ QObject::~QObject()
}
if (d->declarativeData)
- QDeclarativeData::destroyed(d->declarativeData, this);
+ QAbstractDeclarativeData::destroyed(d->declarativeData, this);
{
QMutex *signalSlotMutex = 0;
@@ -2027,7 +2027,7 @@ void QObjectPrivate::setParent_helper(QObject *o)
}
}
if (!wasDeleted && declarativeData)
- QDeclarativeData::parentChanged(declarativeData, q, o);
+ QAbstractDeclarativeData::parentChanged(declarativeData, q, o);
}
/*!