diff options
| author | Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> | 2012-06-19 18:15:48 -0700 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-20 15:45:07 +0200 |
| commit | 3401e91be078b54c8a385757c42da437c24bfc90 (patch) | |
| tree | 8bd8ca83b9ae7ddc41305b76a545738fb326846c /src/widgets/kernel/qapplication_p.h | |
| parent | 994192643a9a17efb016c3231911cadef2a343b9 (diff) | |
Remove references to Q_WS_QWS
Affected code includes:
src/widgets/dialogs/qmessagebox.cpp
src/widgets/graphicsview/qgraphicsitem.cpp
src/widgets/kernel/qapplication_p.h
src/widgets/kernel/qwhatsthis.cpp
src/widgets/kernel/qwidget.h
src/widgets/widgets/qdockwidget.cpp
Change-Id: Ib9e920b3cc1253b39e4e00d7137c21321ecc0399
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/widgets/kernel/qapplication_p.h')
| -rw-r--r-- | src/widgets/kernel/qapplication_p.h | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/src/widgets/kernel/qapplication_p.h b/src/widgets/kernel/qapplication_p.h index 1e5705524e..bc9060a7d5 100644 --- a/src/widgets/kernel/qapplication_p.h +++ b/src/widgets/kernel/qapplication_p.h @@ -100,11 +100,6 @@ extern QSysInfo::WinVersion qt_winver; #elif defined (Q_OS_MAC) extern QSysInfo::MacVersion qt_macver; #endif -#if defined(Q_WS_QWS) -class QWSManager; -class QDirectPainter; -struct QWSServerCleaner { ~QWSServerCleaner(); }; -#endif typedef QHash<QByteArray, QFont> FontHash; FontHash *qt_app_fonts_hash(); @@ -131,9 +126,6 @@ public: static bool x11_apply_settings(); #endif static void reset_instance_pointer(); -#elif defined(Q_WS_QWS) - static bool qws_apply_settings(); - static QWidget *findWidget(const QObjectList&, const QPoint &, bool rec); #endif #ifdef Q_OS_WINCE static int autoMaximizeThreshold; @@ -227,19 +219,6 @@ public: #if defined(Q_WS_X11) static void applyX11SpecificCommandLineArguments(QWidget *main_widget); -#elif defined(Q_WS_QWS) - static void applyQWSSpecificCommandLineArguments(QWidget *main_widget); -#endif - -#ifdef Q_WS_QWS - QPointer<QWSManager> last_manager; - QWSServerCleaner qwsServerCleaner; -# ifndef QT_NO_DIRECTPAINTER - QHash<WId, QDirectPainter *> *directPainters; -# endif - QRect maxWindowRect(const QScreen *screen) const { return maxWindowRects[screen]; } - void setMaxWindowRect(const QScreen *screen, int screenNo, const QRect &rect); - void setScreenTransformation(QScreen *screen, int screenNo, int transformation); #endif static QApplicationPrivate *instance() { return self; } @@ -316,10 +295,6 @@ public: QPixmap applyQIconStyleHelper(QIcon::Mode mode, const QPixmap& base) const; private: -#ifdef Q_WS_QWS - QHash<const QScreen*, QRect> maxWindowRects; -#endif - static QApplicationPrivate *self; static void giveFocusAccordingToFocusPolicy(QWidget *w, |