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

Remove obsolete QMetaObject::activate() overloads.

Browse Source 
The overloads taking a range were previously used for cloned signals
(ones that had default arguments). Commit
919b723088b8617b202b92d80b8d0983e4fd9500 changed how cloned signals are
handled, making the from,to overloads obsolete.

The 3 argument activate() overload that does not take a QMetaObject
argument was marked obsolete by the same commit, but considering that it
is used by our autotests, I've decided to keep it and not mark it as
obsolete anymore.

Change-Id: I631ce84dce156dec68cf26e10787cb35e3f50e18
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
This commit is contained in:
Bradley T. Hughes 2011-11-28 11:49:23 +01:00 committed by Qt by Nokia
parent c5b55d4403
commit 82ffc353db
2 changed files with 2 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3283,17 +3283,6 @@ static void queued_activate(QObject *sender, int signal, QObjectPrivate::Connect
QCoreApplication::postEvent(c->receiver, ev);
}
/*!\internal
\obsolete.
Used to be called from QMetaObject::activate(QObject *, QMetaObject *, int, int, void **) before Qt 4.6
*/
void QMetaObject::activate(QObject *sender, int from_signal_index, int to_signal_index, void **argv)
{
Q_UNUSED(to_signal_index);
activate(sender, from_signal_index, argv);
}
/*!\internal
*/
void QMetaObject::activate(QObject *sender, const QMetaObject *m, int local_signal_index,
@ -3462,7 +3451,7 @@ void QMetaObject::activate(QObject *sender, const QMetaObject *m, int local_sign
}
/*!\internal
Obsolete. (signal_index comes from indexOfMethod())
signal_index comes from indexOfMethod()
*/
void QMetaObject::activate(QObject *sender, int signal_index, void **argv)
{
@ -3472,18 +3461,6 @@ void QMetaObject::activate(QObject *sender, int signal_index, void **argv)
activate(sender, mo, signal_index - mo->methodOffset(), argv);
}
/*!\internal
Obsolete, called by moc generated code before Qt 4.6 for cloned signals
But since Qt 4.6, all clones are connected to their original
*/
void QMetaObject::activate(QObject *sender, const QMetaObject *m,
int from_local_signal_index, int to_local_signal_index, void **argv)
{
Q_UNUSED(to_local_signal_index);
Q_ASSERT(from_local_signal_index == QMetaObjectPrivate::originalClone(m, to_local_signal_index));
activate(sender, m, from_local_signal_index, argv);
}
/*! \internal
Returns the signal index used in the internal connectionLists vector.

4
src/corelib/kernel/qobjectdefs.h
View File

@ -349,10 +349,8 @@ struct Q_CORE_EXPORT QMetaObject
static void connectSlotsByName(QObject *o);
// internal index-based signal activation
static void activate(QObject *sender, int signal_index, void **argv); //obsolete
static void activate(QObject *sender, int from_signal_index, int to_signal_index, void **argv); //obsolete
static void activate(QObject *sender, int signal_index, void **argv);
static void activate(QObject *sender, const QMetaObject *, int local_signal_index, void **argv);
static void activate(QObject *sender, const QMetaObject *, int from_local_signal_index, int to_local_signal_index, void **argv); //obsolete
// internal guarded pointers
static void addGuard(QObject **ptr);