Cleanup leftover QWS

QWS is replaced with QPA in Qt5

Change-Id: Iccec38e55ae23a27ebecd8010e1df7bba8aa5a33
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>

9 files changed, 3 insertions, 29 deletions

diff --git a/mkspecs/common/qnx/qplatformdefs.h b/mkspecs/common/qnx/qplatformdefs.h
index b30cd96002..1db1197afd 100644
--- a/mkspecs/common/qnx/qplatformdefs.h
+++ b/mkspecs/common/qnx/qplatformdefs.h
@@ -99,6 +99,4 @@ inline int getpagesize()
 
 #include <stdlib.h>
 
-#define QT_QWS_TEMP_DIR QString::fromLatin1(qgetenv("TMP"))
-
 #endif // Q_QNX_PLATFORMDEFS_H
diff --git a/mkspecs/unsupported/qnx-X11-g++/qplatformdefs.h b/mkspecs/unsupported/qnx-X11-g++/qplatformdefs.h
index e090179f52..69af7d29e4 100644
--- a/mkspecs/unsupported/qnx-X11-g++/qplatformdefs.h
+++ b/mkspecs/unsupported/qnx-X11-g++/qplatformdefs.h
@@ -96,6 +96,4 @@ inline float strtof(const char *b, char **e)
     return float(strtod(b, e));
 }
 
-#define QT_QWS_TEMP_DIR QString::fromLatin1(qgetenv("TMP"))
-
 #endif // QPLATFORMDEFS_H
diff --git a/src/corelib/io/qfsfileengine_unix.cpp b/src/corelib/io/qfsfileengine_unix.cpp
index 4610e9306c..9980359881 100644
--- a/src/corelib/io/qfsfileengine_unix.cpp
+++ b/src/corelib/io/qfsfileengine_unix.cpp
@@ -56,7 +56,7 @@
 #include <stdlib.h>
 #include <limits.h>
 #include <errno.h>
-#if !defined(QWS) && defined(Q_OS_MAC)
+#if defined(Q_OS_MACOS)
 # include <private/qcore_mac_p.h>
 #endif
 
diff --git a/src/corelib/text/qlocale.cpp b/src/corelib/text/qlocale.cpp
index 184b38c32f..0e73f84c68 100644
--- a/src/corelib/text/qlocale.cpp
+++ b/src/corelib/text/qlocale.cpp
@@ -40,7 +40,7 @@
 
 #include "qglobal.h"
 
-#if !defined(QWS) && defined(Q_OS_MAC)
+#if defined(Q_OS_MACOS)
 #   include "private/qcore_mac_p.h"
 #   include <CoreFoundation/CoreFoundation.h>
 #endif
diff --git a/src/gui/image/qimage.h b/src/gui/image/qimage.h
index 59e07e7dd0..ecb38af172 100644
--- a/src/gui/image/qimage.h
+++ b/src/gui/image/qimage.h
@@ -320,7 +320,6 @@ protected:
     QImage smoothScaled(int w, int h) const;
 
 private:
-    friend class QWSOnScreenSurface;
     QImageData *d;
 
     friend class QRasterPlatformPixmap;
diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp
index b1341d1015..967f4177f3 100644
--- a/src/widgets/kernel/qapplication.cpp
+++ b/src/widgets/kernel/qapplication.cpp
@@ -2266,12 +2266,6 @@ bool qt_try_modal(QWidget *widget, QEvent::Type type)
     bool block_event  = false;
 
     switch (type) {
-#if 0
-    case QEvent::Focus:
-        if (!static_cast<QWSFocusEvent*>(event)->simpleData.get_focus)
-            break;
-        // drop through
-#endif
     case QEvent::MouseButtonPress:                        // disallow mouse/key events
     case QEvent::MouseButtonRelease:
     case QEvent::MouseMove:
diff --git a/src/widgets/kernel/qwidget.h b/src/widgets/kernel/qwidget.h
index 75fefb8ffd..622428ebd1 100644
--- a/src/widgets/kernel/qwidget.h
+++ b/src/widgets/kernel/qwidget.h
@@ -65,7 +65,6 @@ QT_BEGIN_NAMESPACE
 
 
 class QLayout;
-class QWSRegionManager;
 class QStyle;
 class QAction;
 class QVariant;
diff --git a/src/widgets/styles/qwindowsstyle.cpp b/src/widgets/styles/qwindowsstyle.cpp
index 78e244307f..e6198540a3 100644
--- a/src/widgets/styles/qwindowsstyle.cpp
+++ b/src/widgets/styles/qwindowsstyle.cpp
@@ -2320,12 +2320,11 @@ QSize QWindowsStyle::sizeFromContents(ContentsType ct, const QStyleOption *opt,
             int minwidth = int(QStyleHelper::dpiScaled(75, dpi));
             int minheight = int(QStyleHelper::dpiScaled(23, dpi));
 
-#ifndef QT_QWS_SMALL_PUSHBUTTON
             if (w < minwidth + defwidth && !btn->text.isEmpty())
                 w = minwidth + defwidth;
             if (h < minheight + defwidth)
                 h = minheight + defwidth;
-#endif
+
             sz = QSize(w, h);
         }
         break;
diff --git a/src/widgets/util/qcolormap.cpp b/src/widgets/util/qcolormap.cpp
index ba975de4bb..81a654e7e6 100644
--- a/src/widgets/util/qcolormap.cpp
+++ b/src/widgets/util/qcolormap.cpp
@@ -175,12 +175,6 @@ uint QColormap::pixel(const QColor &color) const
             const int green_mask = 0x00ff00;
             const int blue_mask  = 0x0000ff;
             const int tg = g << green_shift;
-#ifdef QT_QWS_DEPTH_32_BGR
-            if (qt_screen->pixelType() == QScreen::BGRPixel) {
-                const int tb = b << red_shift;
-                return 0xff000000 | (r & blue_mask) | (tg & green_mask) | (tb & red_mask);
-            }
-#endif
             const int tr = r << red_shift;
             return 0xff000000 | (b & blue_mask) | (tg & green_mask) | (tr & red_mask);
         }
@@ -202,13 +196,6 @@ const QColor QColormap::colorAt(uint pixel) const
         const int red_mask   = 0xff0000;
         const int green_mask = 0x00ff00;
         const int blue_mask  = 0x0000ff;
-#ifdef QT_QWS_DEPTH_32_BGR
-        if (qt_screen->pixelType() == QScreen::BGRPixel) {
-            return QColor((pixel & blue_mask),
-                          (pixel & green_mask) >> green_shift,
-                          (pixel & red_mask) >> red_shift);
-        }
-#endif
         return QColor((pixel & red_mask) >> red_shift,
                       (pixel & green_mask) >> green_shift,
                       (pixel & blue_mask));