Remove QQmlData::objectNameChanged callback.

The objectName property now has a proper NOTIFY signal. Also
remove the objectName accessor, as it is no longer required.

Task-number: QTBUG-23526
Change-Id: Ib18ba7335bf62a2fe2a9e489cb4c0f1fb142d74c
Reviewed-by: Chris Adams <christopher.adams@nokia.com>

1 files changed, 1 insertions, 5 deletions

diff --git a/src/qml/qml/qqmldata_p.h b/src/qml/qml/qqmldata_p.h
index 4849db0060..08f68b661e 100644
--- a/src/qml/qml/qqmldata_p.h
+++ b/src/qml/qml/qqmldata_p.h
@@ -92,7 +92,6 @@ public:
             initialized = true;
             QAbstractDeclarativeData::destroyed = destroyed;
             QAbstractDeclarativeData::parentChanged = parentChanged;
-            QAbstractDeclarativeData::objectNameChanged = objectNameChanged;
             QAbstractDeclarativeData::signalEmitted = signalEmitted;
             QAbstractDeclarativeData::receivers = receivers;
         }
@@ -100,13 +99,11 @@ public:
 
     static void destroyed(QAbstractDeclarativeData *, QObject *);
     static void parentChanged(QAbstractDeclarativeData *, QObject *, QObject *);
-    static void objectNameChanged(QAbstractDeclarativeData *, QObject *);
     static void signalEmitted(QAbstractDeclarativeData *, QObject *, int, void **);
     static int receivers(QAbstractDeclarativeData *, const QObject *, int);
 
     void destroyed(QObject *);
     void parentChanged(QObject *, QObject *);
-    void objectNameChanged(QObject *);
 
     void setImplicitDestructible() {
         if (!explicitIndestructibleSet) indestructible = false;
@@ -191,7 +188,6 @@ public:
     }
 
     bool hasExtendedData() const { return extendedData != 0; }
-    QQmlNotifier *objectNameNotifier() const;
     QHash<int, QObject *> *attachedProperties() const;
 
     static inline bool wasDeleted(QObject *);
@@ -200,7 +196,7 @@ public:
     static inline void setQueuedForDeletion(QObject *);
 
 private:
-    // For objectNameNotifier and attachedProperties
+    // For attachedProperties
     mutable QQmlDataExtended *extendedData;
 };