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/qnamespace.h | |
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/qnamespace.h')
-rw-r--r-- | src/corelib/global/qnamespace.h | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index 2e266b52f3..16b4b0b093 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -1592,26 +1592,6 @@ public: RelayoutDropped }; - - enum Callback { - ConnectCallback, - DisconnectCallback, - AdoptCurrentThread, - EventNotifyCallback, - LastCallback - }; - - enum InternalFunction { - CreateThreadForAdoption, - RefAdoptedThread, - DerefAdoptedThread, - SetCurrentThreadToMainThread, - SetQObjectSender, - GetQObjectSender, - ResetQObjectSender, - LastInternalFunction - }; - enum DockPosition { LeftDock, RightDock, @@ -1619,12 +1599,6 @@ public: BottomDock, DockCount }; - - static bool registerCallback(Callback, qInternalCallback); - static bool unregisterCallback(Callback, qInternalCallback); - - static bool activateCallbacks(Callback, void **); - static bool callFunction(InternalFunction func, void **); }; QT_END_NAMESPACE |