diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index 0adbc9c8198..2be0a7c759a 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -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. diff --git a/src/corelib/kernel/qobjectdefs.h b/src/corelib/kernel/qobjectdefs.h index ce5a924e234..2b57b403b31 100644 --- a/src/corelib/kernel/qobjectdefs.h +++ b/src/corelib/kernel/qobjectdefs.h @@ -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);