Remove QInternal callbacks and internal functions

After commit 79f675a1e0f628bbc25345ebc1eb1f5809166c6b, the connect and
disconnect callback API effectively becomes useless. Now that these
callbacks cannot/do not, it makes little sense to keep the backdoors
added for Qt Jambi support.

Remove them for now. Should the Qt Jambi team want/need to port to Qt 5,
we can re-add them, possibly designing a better API for doing so as
well.

Change-Id: I6209a1d647d683c979d5294b632b8c12c0f9f91c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>

2 files changed, 0 insertions, 55 deletions

diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
index de983c2ded..18ec217d2a 100644
--- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -298,14 +298,6 @@ Q_CORE_EXPORT uint qGlobalPostedEventsCount()
     return currentThreadData->postEventList.size() - currentThreadData->postEventList.startOffset;
 }
 
-
-void qt_set_current_thread_to_main_thread()
-{
-    QCoreApplicationPrivate::theMainThread = QThread::currentThread();
-}
-
-
-
 QCoreApplication *QCoreApplication::self = 0;
 QAbstractEventDispatcher *QCoreApplicationPrivate::eventDispatcher = 0;
 uint QCoreApplicationPrivate::attribs;
@@ -795,14 +787,6 @@ bool QCoreApplication::testAttribute(Qt::ApplicationAttribute attribute)
 */
 bool QCoreApplication::notifyInternal(QObject *receiver, QEvent *event)
 {
-    // Make it possible for Qt Jambi and QSA to hook into events even
-    // though QApplication is subclassed...
-    bool result = false;
-    void *cbdata[] = { receiver, event, &result };
-    if (QInternal::activateCallbacks(QInternal::EventNotifyCallback, cbdata)) {
-        return result;
-    }
-
     // Qt enforces the rule that events can only be sent to objects in
     // the current thread, so receiver->d_func()->threadData is
     // equivalent to QThreadData::current(), just without the function
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index b1d2463737..e4ef826ffd 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -2388,13 +2388,6 @@ QMetaObject::Connection QObject::connect(const QObject *sender, const char *sign
                                      const QObject *receiver, const char *method,
                                      Qt::ConnectionType type)
 {
-    {
-        void *result = 0;
-        const void *cbdata[] = { sender, signal, receiver, method, &type , &result};
-        if (QInternal::activateCallbacks(QInternal::ConnectCallback, (void **) cbdata))
-            return QMetaObject::Connection(result);
-    }
-
 #ifndef QT_NO_DEBUG
     bool warnCompat = true;
 #endif
@@ -2573,18 +2566,6 @@ QMetaObject::Connection QObject::connect(const QObject *sender, const QMetaMetho
     signalSignature.append((char)(QSIGNAL_CODE + '0'));
     signalSignature.append(signal.signature());
 
-    {
-        QByteArray methodSignature;
-        methodSignature.reserve(qstrlen(method.signature())+1);
-        methodSignature.append((char)(method.methodType() == QMetaMethod::Slot ? QSLOT_CODE
-                                    : method.methodType() == QMetaMethod::Signal ? QSIGNAL_CODE : 0  + '0'));
-        methodSignature.append(method.signature());
-        void *result = 0;
-        const void *cbdata[] = { sender, signalSignature.constData(), receiver, methodSignature.constData(), &type, &result };
-        if (QInternal::activateCallbacks(QInternal::ConnectCallback, (void **) cbdata))
-            return QMetaObject::Connection(result);
-    }
-
     int signal_index;
     int method_index;
     {
@@ -2714,12 +2695,6 @@ bool QObject::disconnect(const QObject *sender, const char *signal,
         return false;
     }
 
-    {
-        const void *cbdata[] = { sender, signal, receiver, method };
-        if (QInternal::activateCallbacks(QInternal::DisconnectCallback, (void **) cbdata))
-            return true;
-    }
-
     const char *signal_arg = signal;
     QByteArray signal_name;
     bool signal_found = false;
@@ -2868,20 +2843,6 @@ bool QObject::disconnect(const QObject *sender, const QMetaMethod &signal,
         signalSignature.append(signal.signature());
     }
 
-    {
-        QByteArray methodSignature;
-        if (method.mobj) {
-            methodSignature.reserve(qstrlen(method.signature())+1);
-            methodSignature.append((char)(method.methodType() == QMetaMethod::Slot ? QSLOT_CODE
-                                        : method.methodType() == QMetaMethod::Signal ? QSIGNAL_CODE : 0  + '0'));
-            methodSignature.append(method.signature());
-        }
-        const void *cbdata[] = { sender, signal.mobj ? signalSignature.constData() : 0,
-                                 receiver, method.mobj ? methodSignature.constData() : 0 };
-        if (QInternal::activateCallbacks(QInternal::DisconnectCallback, (void **) cbdata))
-            return true;
-    }
-
     int signal_index;
     int method_index;
     {