1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove QAbstractDeclarativeData::objectNameChanged.

Browse Source 
There is now an actual NOTIFY signal for this property, and the callback
is no longer necessary.

Change-Id: I664714e22e607c747f144250cfb78de8c1d28686
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
This commit is contained in:
Michael Brasser 2012-04-19 12:31:45 +10:00 committed by Qt by Nokia
parent 81c68fe029
commit c47c8ba59e
2 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/corelib/kernel/qobject.cpp
View File

@ -182,7 +182,6 @@ private:
void (*QAbstractDeclarativeData::destroyed)(QAbstractDeclarativeData *, QObject *) = 0; void (*QAbstractDeclarativeData::destroyed)(QAbstractDeclarativeData *, QObject *) = 0;
void (*QAbstractDeclarativeData::parentChanged)(QAbstractDeclarativeData *, QObject *, QObject *) = 0; void (*QAbstractDeclarativeData::parentChanged)(QAbstractDeclarativeData *, QObject *, QObject *) = 0;
void (*QAbstractDeclarativeData::objectNameChanged)(QAbstractDeclarativeData *, QObject *) = 0;
void (*QAbstractDeclarativeData::signalEmitted)(QAbstractDeclarativeData *, QObject *, int, void **) = 0; void (*QAbstractDeclarativeData::signalEmitted)(QAbstractDeclarativeData *, QObject *, int, void **) = 0;
int (*QAbstractDeclarativeData::receivers)(QAbstractDeclarativeData *, const QObject *, int) = 0; int (*QAbstractDeclarativeData::receivers)(QAbstractDeclarativeData *, const QObject *, int) = 0;
@ -989,8 +988,6 @@ void QObject::setObjectName(const QString &name)
Q_D(QObject); Q_D(QObject);
if (d->objectName != name) { if (d->objectName != name) {
d->objectName = name; d->objectName = name;
if (d->declarativeData && d->declarativeData->objectNameChanged)
d->declarativeData->objectNameChanged(d->declarativeData, this);
emit objectNameChanged(d->objectName); emit objectNameChanged(d->objectName);
} }
} }

1
src/corelib/kernel/qobject_p.h
View File

@ -89,7 +89,6 @@ class Q_CORE_EXPORT QAbstractDeclarativeData
public: public:
static void (*destroyed)(QAbstractDeclarativeData *, QObject *); static void (*destroyed)(QAbstractDeclarativeData *, QObject *);
static void (*parentChanged)(QAbstractDeclarativeData *, QObject *, QObject *); static void (*parentChanged)(QAbstractDeclarativeData *, QObject *, QObject *);
static void (*objectNameChanged)(QAbstractDeclarativeData *, QObject *);
static void (*signalEmitted)(QAbstractDeclarativeData *, QObject *, int, void **); static void (*signalEmitted)(QAbstractDeclarativeData *, QObject *, int, void **);
static int (*receivers)(QAbstractDeclarativeData *, const QObject *, int); static int (*receivers)(QAbstractDeclarativeData *, const QObject *, int);
}; };