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.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.h')
-rw-r--r-- | src/widgets/kernel/qapplication.h | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/src/widgets/kernel/qapplication.h b/src/widgets/kernel/qapplication.h index aec2c07763..8fd988f7a8 100644 --- a/src/widgets/kernel/qapplication.h +++ b/src/widgets/kernel/qapplication.h @@ -50,10 +50,6 @@ #ifdef QT_INCLUDE_COMPAT # include <QtWidgets/qdesktopwidget.h> #endif -#ifdef QT3_SUPPORT -# include <QtWidgets/qwidget.h> -# include <QtGui/qpalette.h> -#endif #ifdef Q_WS_QWS # include <QtGui/qrgb.h> # include <QtGui/qtransportauth_qws.h> @@ -170,10 +166,6 @@ public: static QIcon windowIcon(); -#ifdef QT3_SUPPORT - static QT3_SUPPORT QWidget *mainWidget(); - static QT3_SUPPORT void setMainWidget(QWidget *); -#endif static QWidgetList allWidgets(); static QWidgetList topLevelWidgets(); @@ -320,45 +312,6 @@ protected: bool event(QEvent *); bool compressEvent(QEvent *, QObject *receiver, QPostEventList *); -#ifdef QT3_SUPPORT -public: - static inline QT3_SUPPORT void setReverseLayout(bool b) { setLayoutDirection(b?Qt::RightToLeft:Qt::LeftToRight); } - static inline bool QT3_SUPPORT reverseLayout() { return layoutDirection() == Qt::RightToLeft; } - static QT3_SUPPORT Qt::Alignment horizontalAlignment(Qt::Alignment align); - typedef int ColorMode; - enum { NormalColors = NormalColor, CustomColors = CustomColor }; - static inline QT3_SUPPORT ColorMode colorMode() { return static_cast<ColorMode>(colorSpec()); } - static inline QT3_SUPPORT void setColorMode(ColorMode mode) { setColorSpec(int(mode)); } -#if defined(Q_OS_WIN32) || defined(Q_OS_CYGWIN) - static QT3_SUPPORT Qt::WindowsVersion winVersion() { return (Qt::WindowsVersion)QSysInfo::WindowsVersion; } -#endif -#if defined(Q_OS_MAC) - static QT3_SUPPORT Qt::MacintoshVersion macVersion() { return (Qt::MacintoshVersion)QSysInfo::MacintoshVersion; } -#endif -# ifndef QT_NO_CURSOR - inline static QT3_SUPPORT void setOverrideCursor(const QCursor &cursor, bool replace) - { if (replace) changeOverrideCursor(cursor); else setOverrideCursor(cursor); } -# endif - inline static QT3_SUPPORT bool hasGlobalMouseTracking() {return true;} - inline static QT3_SUPPORT void setGlobalMouseTracking(bool) {} - inline static QT3_SUPPORT void flushX() { flush(); } - static inline QT3_SUPPORT void setWinStyleHighlightColor(const QColor &c) { - QPalette p(palette()); - p.setColor(QPalette::Highlight, c); - setPalette(p); - } - static inline QT3_SUPPORT const QColor &winStyleHighlightColor() - { return palette().color(QPalette::Active, QPalette::Highlight); } - static inline QT3_SUPPORT void setPalette(const QPalette &pal, bool, const char* className = 0) - { setPalette(pal, className); } - static inline QT3_SUPPORT void setFont(const QFont &font, bool, const char* className = 0) - { setFont(font, className); } - - static inline QT3_SUPPORT QWidget *widgetAt(int x, int y, bool child) - { QWidget *w = widgetAt(x, y); return child ? w : (w ? w->window() : 0); } - static inline QT3_SUPPORT QWidget *widgetAt(const QPoint &p, bool child) - { QWidget *w = widgetAt(p); return child ? w : (w ? w->window() : 0); } -#endif // QT3_SUPPORT #if defined(Q_INTERNAL_QAPP_SRC) || defined(qdoc) QApplication(int &argc, char **argv); |