diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-09-27 14:48:51 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-28 03:18:16 +0200 |
commit | a85d343a39577cdf953d0759e356c59a77ae743f (patch) | |
tree | fdbd9229902d5efc0ca637dc79d6aa7cc5645635 /src/widgets/kernel/qapplication_p.h | |
parent | 3b6bb13e6a197bb4ba85b397ae9d2b8c659d6b26 (diff) |
Widgets: Remove QT3_SUPPPORT.
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Change-Id: Ie884f0cc9b3970b01c3c0c26600b1bcd92548077
Reviewed-on: http://codereview.qt-project.org/5629
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/widgets/kernel/qapplication_p.h')
-rw-r--r-- | src/widgets/kernel/qapplication_p.h | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/src/widgets/kernel/qapplication_p.h b/src/widgets/kernel/qapplication_p.h index e466528cfb..e451a53b6c 100644 --- a/src/widgets/kernel/qapplication_p.h +++ b/src/widgets/kernel/qapplication_p.h @@ -195,13 +195,6 @@ QMacTabletHash *qt_mac_tablet_hash(); # endif #endif -#ifdef QT3_SUPPORT -extern "C" { - typedef bool (*Ptrqt_tryAccelEvent)(QWidget *w, QKeyEvent *e); - typedef bool (*Ptrqt_tryComposeUnicode)(QWidget *w, QKeyEvent *e); - typedef bool (*Ptrqt_dispatchAccelEvent)(QWidget *w, QKeyEvent *e); -} -#endif #if defined(Q_WS_WIN) typedef BOOL (WINAPI *PtrRegisterTouchWindow)(HWND, ULONG); @@ -387,19 +380,6 @@ public: QShortcutMap shortcutMap; #endif -#ifdef QT3_SUPPORT - bool qt_compat_used; - bool qt_compat_resolved; - Ptrqt_tryAccelEvent qt_tryAccelEvent; - Ptrqt_tryComposeUnicode qt_tryComposeUnicode; - Ptrqt_dispatchAccelEvent qt_dispatchAccelEvent; - - bool use_compat() { - return qt_tryAccelEvent - && qt_tryComposeUnicode - && qt_dispatchAccelEvent; - } -#endif static QInputContext *inputContext; static Qt::MouseButtons mouse_buttons; |