diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2011-06-28 12:17:34 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-06-29 15:10:14 +0200 |
| commit | 118b3d3f8415037a1afddc6b962bd809905527d5 (patch) | |
| tree | 843b8c725400cc468844d41708f2f0543ef0c283 /src/corelib/kernel/qcoreapplication.h | |
| parent | fa65123a86529bbbdaf2b774d741400a3dbfd593 (diff) | |
Remove Qt3 support functionality from parts of QtCore
Change-Id: I90f391e9bfc412087bd0401e28d2497571f81aa1
Reviewed-on: http://codereview.qt.nokia.com/825
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Liang Qi <liang.qi@nokia.com>
Diffstat (limited to 'src/corelib/kernel/qcoreapplication.h')
| -rw-r--r-- | src/corelib/kernel/qcoreapplication.h | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/src/corelib/kernel/qcoreapplication.h b/src/corelib/kernel/qcoreapplication.h index d4356e3e36..adc70387cc 100644 --- a/src/corelib/kernel/qcoreapplication.h +++ b/src/corelib/kernel/qcoreapplication.h @@ -46,10 +46,6 @@ #include <QtCore/qcoreevent.h> #include <QtCore/qeventloop.h> -#ifdef QT_INCLUDE_COMPAT -#include <QtCore/qstringlist.h> -#endif - #if defined(Q_WS_WIN) && !defined(tagMSG) typedef struct tagMSG MSG; #endif @@ -79,9 +75,6 @@ class Q_CORE_EXPORT QCoreApplication : public QObject Q_DECLARE_PRIVATE(QCoreApplication) public: enum { ApplicationFlags = QT_VERSION -#if !defined(QT3_SUPPORT) - | 0x01000000 -#endif }; #if defined(QT_BUILD_CORE_LIB) || defined(qdoc) @@ -164,19 +157,6 @@ public: static void flush(); -#if defined(QT3_SUPPORT) - inline QT3_SUPPORT void lock() {} - inline QT3_SUPPORT void unlock(bool = true) {} - inline QT3_SUPPORT bool locked() { return false; } - inline QT3_SUPPORT bool tryLock() { return false; } - - static inline QT3_SUPPORT void processOneEvent() - { processEvents(QEventLoop::WaitForMoreEvents); } - static QT3_SUPPORT int enter_loop(); - static QT3_SUPPORT void exit_loop(); - static QT3_SUPPORT int loopLevel(); -#endif - #if defined(Q_WS_WIN) virtual bool winEventFilter(MSG *message, long *result); #endif |