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

Mark qt_addObject/qt_removeObject for removal in Qt6

Browse Source 
We now have qtHookData, which is a better (and cheaper) way to add hooks
for object creation and deletion. For binary-compatibility reasons we
cannot remove it in Qt5.

Change-Id: Iecd9f4e1195f90279c395845fa26c6301b67b9a1
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Erik Verbruggen 2016-12-06 11:59:50 +01:00
parent 1f87726980
commit 062be10228
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -147,12 +147,13 @@ static inline QMutex *signalSlotLock(const QObject *o)
uint(quintptr(o)) % sizeof(_q_ObjectMutexPool)/sizeof(QBasicMutex)]); uint(quintptr(o)) % sizeof(_q_ObjectMutexPool)/sizeof(QBasicMutex)]);
} }
// ### Qt >= 5.6, remove qt_add/removeObject #if QT_VERSION < 0x60000
extern "C" Q_CORE_EXPORT void qt_addObject(QObject *) extern "C" Q_CORE_EXPORT void qt_addObject(QObject *)
{} {}
extern "C" Q_CORE_EXPORT void qt_removeObject(QObject *) extern "C" Q_CORE_EXPORT void qt_removeObject(QObject *)
{} {}
#endif
struct QConnectionSenderSwitcher { struct QConnectionSenderSwitcher {
QObject *receiver; QObject *receiver;
@ -811,7 +812,9 @@ QObject::QObject(QObject *parent)
QT_RETHROW; QT_RETHROW;
} }
} }
#if QT_VERSION < 0x60000
qt_addObject(this); qt_addObject(this);
#endif
if (Q_UNLIKELY(qtHookData[QHooks::AddQObject])) if (Q_UNLIKELY(qtHookData[QHooks::AddQObject]))
reinterpret_cast<QHooks::AddQObjectCallback>(qtHookData[QHooks::AddQObject])(this); reinterpret_cast<QHooks::AddQObjectCallback>(qtHookData[QHooks::AddQObject])(this);
} }
@ -844,7 +847,9 @@ QObject::QObject(QObjectPrivate &dd, QObject *parent)
QT_RETHROW; QT_RETHROW;
} }
} }
#if QT_VERSION < 0x60000
qt_addObject(this); qt_addObject(this);
#endif
if (Q_UNLIKELY(qtHookData[QHooks::AddQObject])) if (Q_UNLIKELY(qtHookData[QHooks::AddQObject]))
reinterpret_cast<QHooks::AddQObjectCallback>(qtHookData[QHooks::AddQObject])(this); reinterpret_cast<QHooks::AddQObjectCallback>(qtHookData[QHooks::AddQObject])(this);
} }
@ -1016,7 +1021,9 @@ QObject::~QObject()
if (!d->children.isEmpty()) if (!d->children.isEmpty())
d->deleteChildren(); d->deleteChildren();
#if QT_VERSION < 0x60000
qt_removeObject(this); qt_removeObject(this);
#endif
if (Q_UNLIKELY(qtHookData[QHooks::RemoveQObject])) if (Q_UNLIKELY(qtHookData[QHooks::RemoveQObject]))
reinterpret_cast<QHooks::RemoveQObjectCallback>(qtHookData[QHooks::RemoveQObject])(this); reinterpret_cast<QHooks::RemoveQObjectCallback>(qtHookData[QHooks::RemoveQObject])(this);