diff options
| author | Andrew den Exter <andrew.den-exter@nokia.com> | 2012-05-10 17:39:02 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-10 09:46:51 +0200 |
| commit | 9a6d754e61ba57b8bf7a864011750910ac58ccbf (patch) | |
| tree | 5735308ae80473594e22ed2427a8b8c364b9e5c6 /src | |
| parent | fbeb886c5788024ff31c8e724c4d96ac1ac272b5 (diff) | |
| download | qtquick1-9a6d754e61ba57b8bf7a864011750910ac58ccbf.tar.gz | |
Remove hook for objectNameChanged signal handler.
Made obsolete in Qt5 with the addition of an objectNameChanged signal
to QObject.
Change-Id: I86df09ade866f0322303f40de223cb84b8e95c27
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/qml/qdeclarativedata_p.h | 3 | ||||
| -rw-r--r-- | src/declarative/qml/qdeclarativeengine.cpp | 10 |
2 files changed, 0 insertions, 13 deletions
diff --git a/src/declarative/qml/qdeclarativedata_p.h b/src/declarative/qml/qdeclarativedata_p.h index 302f321c..80157bbf 100644 --- a/src/declarative/qml/qdeclarativedata_p.h +++ b/src/declarative/qml/qdeclarativedata_p.h @@ -84,15 +84,12 @@ public: static inline void init() { QAbstractDeclarativeData::destroyed = destroyed; QAbstractDeclarativeData::parentChanged = parentChanged; - QAbstractDeclarativeData::objectNameChanged = objectNameChanged; } static void destroyed(QAbstractDeclarativeData *, QObject *); static void parentChanged(QAbstractDeclarativeData *, QObject *, QObject *); - static void objectNameChanged(QAbstractDeclarativeData *, QObject *); void destroyed(QObject *); - void objectNameChanged(QObject *); void setImplicitDestructible() { if (!explicitIndestructibleSet) indestructible = false; diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp index 1d383fb6..23f852c5 100644 --- a/src/declarative/qml/qdeclarativeengine.cpp +++ b/src/declarative/qml/qdeclarativeengine.cpp @@ -560,11 +560,6 @@ void QDeclarativeData::parentChanged(QAbstractDeclarativeData *d, QObject *o, QO Q_UNUSED(p) } -void QDeclarativeData::objectNameChanged(QAbstractDeclarativeData *d, QObject *o) -{ - static_cast<QDeclarativeData *>(d)->objectNameChanged(o); -} - void QDeclarativeEnginePrivate::init() { Q_Q(QDeclarativeEngine); @@ -1174,11 +1169,6 @@ void QDeclarativeData::destroyed(QObject *object) delete this; } -void QDeclarativeData::objectNameChanged(QObject *) -{ - if (extendedData) objectNameNotifier()->notify(); -} - bool QDeclarativeData::hasBindingBit(int bit) const { if (bindingBitsSize > bit) |