From c47c8ba59e87facaaad53e69f7830719217110aa Mon Sep 17 00:00:00 2001 From: Michael Brasser Date: Thu, 19 Apr 2012 12:31:45 +1000 Subject: Remove QAbstractDeclarativeData::objectNameChanged. There is now an actual NOTIFY signal for this property, and the callback is no longer necessary. Change-Id: I664714e22e607c747f144250cfb78de8c1d28686 Reviewed-by: Kent Hansen Reviewed-by: Olivier Goffart Reviewed-by: Michael Brasser --- src/corelib/kernel/qobject.cpp | 3 --- 1 file changed, 3 deletions(-) (limited to 'src/corelib/kernel/qobject.cpp') diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index 443c7991462..9dbc92d32f4 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -182,7 +182,6 @@ private: void (*QAbstractDeclarativeData::destroyed)(QAbstractDeclarativeData *, QObject *) = 0; void (*QAbstractDeclarativeData::parentChanged)(QAbstractDeclarativeData *, QObject *, QObject *) = 0; -void (*QAbstractDeclarativeData::objectNameChanged)(QAbstractDeclarativeData *, QObject *) = 0; void (*QAbstractDeclarativeData::signalEmitted)(QAbstractDeclarativeData *, QObject *, int, void **) = 0; int (*QAbstractDeclarativeData::receivers)(QAbstractDeclarativeData *, const QObject *, int) = 0; @@ -989,8 +988,6 @@ void QObject::setObjectName(const QString &name) Q_D(QObject); if (d->objectName != name) { d->objectName = name; - if (d->declarativeData && d->declarativeData->objectNameChanged) - d->declarativeData->objectNameChanged(d->declarativeData, this); emit objectNameChanged(d->objectName); } } -- cgit v1.2.3