diff options
author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2011-11-29 10:59:48 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-02 15:59:58 +0100 |
commit | ad8edac53c65368f7ff269332bd66bd85e2633b4 (patch) | |
tree | 7999854d2784adea00319acaad69a0a38a1baa2f /src/corelib/global/qglobal.cpp | |
parent | 613183ff8c101fe544814259197d897b3540bc85 (diff) |
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>
Diffstat (limited to 'src/corelib/global/qglobal.cpp')
-rw-r--r-- | src/corelib/global/qglobal.cpp | 102 |
1 files changed, 0 insertions, 102 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index 91ac521a0b..8b60cdb5c3 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -2831,108 +2831,6 @@ int qrand() with meaningful parameter names in their signatures. */ - -struct QInternal_CallBackTable { - QVector<QList<qInternalCallback> > callbacks; -}; - -Q_GLOBAL_STATIC(QInternal_CallBackTable, global_callback_table) - -bool QInternal::registerCallback(Callback cb, qInternalCallback callback) -{ - if (cb >= 0 && cb < QInternal::LastCallback) { - QInternal_CallBackTable *cbt = global_callback_table(); - cbt->callbacks.resize(cb + 1); - cbt->callbacks[cb].append(callback); - return true; - } - return false; -} - -bool QInternal::unregisterCallback(Callback cb, qInternalCallback callback) -{ - if (cb >= 0 && cb < QInternal::LastCallback) { - QInternal_CallBackTable *cbt = global_callback_table(); - return (bool) cbt->callbacks[cb].removeAll(callback); - } - return false; -} - -bool QInternal::activateCallbacks(Callback cb, void **parameters) -{ - Q_ASSERT_X(cb >= 0, "QInternal::activateCallback()", "Callback id must be a valid id"); - - QInternal_CallBackTable *cbt = global_callback_table(); - if (cbt && cb < cbt->callbacks.size()) { - QList<qInternalCallback> callbacks = cbt->callbacks[cb]; - bool ret = false; - for (int i=0; i<callbacks.size(); ++i) - ret |= (callbacks.at(i))(parameters); - return ret; - } - return false; -} - -extern void qt_set_current_thread_to_main_thread(); - -bool QInternal::callFunction(InternalFunction func, void **args) -{ - Q_ASSERT_X(func >= 0, - "QInternal::callFunction()", "Callback id must be a valid id"); -#ifndef QT_NO_QOBJECT - switch (func) { -#ifndef QT_NO_THREAD - case QInternal::CreateThreadForAdoption: - *args = QAdoptedThread::createThreadForAdoption(); - return true; -#endif - case QInternal::RefAdoptedThread: - QThreadData::get2((QThread *) *args)->ref(); - return true; - case QInternal::DerefAdoptedThread: - QThreadData::get2((QThread *) *args)->deref(); - return true; - case QInternal::SetCurrentThreadToMainThread: - qt_set_current_thread_to_main_thread(); - return true; - case QInternal::SetQObjectSender: { - QObject *receiver = (QObject *) args[0]; - QObjectPrivate::Sender *sender = new QObjectPrivate::Sender; - sender->sender = (QObject *) args[1]; - sender->signal = *(int *) args[2]; - sender->ref = 1; - - // Store the old sender as "return value" - args[3] = QObjectPrivate::setCurrentSender(receiver, sender); - args[4] = sender; - return true; - } - case QInternal::GetQObjectSender: { - QObject *receiver = (QObject *) args[0]; - QObjectPrivate *d = QObjectPrivate::get(receiver); - args[1] = d->currentSender ? d->currentSender->sender : 0; - return true; - } - case QInternal::ResetQObjectSender: { - QObject *receiver = (QObject *) args[0]; - QObjectPrivate::Sender *oldSender = (QObjectPrivate::Sender *) args[1]; - QObjectPrivate::Sender *sender = (QObjectPrivate::Sender *) args[2]; - QObjectPrivate::resetCurrentSender(receiver, sender, oldSender); - delete sender; - return true; - } - - default: - break; - } -#else - Q_UNUSED(args); - Q_UNUSED(func); -#endif - - return false; -} - /*! \macro Q_BYTE_ORDER \relates <QtGlobal> |