From eee4c6f190d427ab6d5a9acf9fe6327df6cf8c2d Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Date: Mon, 2 Mar 2015 12:12:55 +0100
Subject: Clean headers in the Windows plugin.

Change-Id: Ibc6b904e6e0b21f5daa0730a7eda2cae43cd3dcf
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
---
 src/plugins/platforms/windows/qwindowsguieventdispatcher.h |  3 ---
 src/plugins/platforms/windows/qwindowsintegration.h        |  1 -
 src/plugins/platforms/windows/qwindowsmime.h               |  1 -
 src/plugins/platforms/windows/qwindowsnativeimage.h        |  2 --
 src/plugins/platforms/windows/qwindowsnativeinterface.cpp  |  5 +++++
 src/plugins/platforms/windows/qwindowsnativeinterface.h    |  3 +--
 src/plugins/platforms/windows/qwindowsole.h                |  3 ---
 src/plugins/platforms/windows/qwindowsopengltester.h       |  2 --
 src/plugins/platforms/windows/qwindowstheme.cpp            | 11 +++++++++++
 src/plugins/platforms/windows/qwindowstheme.h              |  9 ---------
 src/plugins/platforms/windows/qwindowswindow.cpp           |  1 +
 src/plugins/platforms/windows/qwindowswindow.h             |  1 -
 12 files changed, 18 insertions(+), 24 deletions(-)

(limited to 'src/plugins/platforms/windows')

diff --git a/src/plugins/platforms/windows/qwindowsguieventdispatcher.h b/src/plugins/platforms/windows/qwindowsguieventdispatcher.h
index 3db6eac662..3389139461 100644
--- a/src/plugins/platforms/windows/qwindowsguieventdispatcher.h
+++ b/src/plugins/platforms/windows/qwindowsguieventdispatcher.h
@@ -34,11 +34,8 @@
 #ifndef QWINDOWSGUIEVENTDISPATCHER_H
 #define QWINDOWSGUIEVENTDISPATCHER_H
 
-#include "qtwindowsglobal.h"
 #include "qtwindows_additional.h"
 
-#include <QtCore/QPair>
-#include <QtCore/QEventLoop>
 #include <QtCore/private/qeventdispatcher_win_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/platforms/windows/qwindowsintegration.h b/src/plugins/platforms/windows/qwindowsintegration.h
index 8a2d14f172..fa5192ba03 100644
--- a/src/plugins/platforms/windows/qwindowsintegration.h
+++ b/src/plugins/platforms/windows/qwindowsintegration.h
@@ -35,7 +35,6 @@
 #ifndef QWINDOWSINTEGRATION_H
 #define QWINDOWSINTEGRATION_H
 
-#include <QtCore/qconfig.h>
 #include <qpa/qplatformintegration.h>
 #include <QtCore/QScopedPointer>
 
diff --git a/src/plugins/platforms/windows/qwindowsmime.h b/src/plugins/platforms/windows/qwindowsmime.h
index e7a01ae79a..952410e14b 100644
--- a/src/plugins/platforms/windows/qwindowsmime.h
+++ b/src/plugins/platforms/windows/qwindowsmime.h
@@ -39,7 +39,6 @@
 #include <QtCore/QVector>
 #include <QtCore/QList>
 #include <QtCore/QVariant>
-#include <QtCore/QSharedPointer>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/windows/qwindowsnativeimage.h b/src/plugins/platforms/windows/qwindowsnativeimage.h
index cbf93b9602..6f9ce93ef0 100644
--- a/src/plugins/platforms/windows/qwindowsnativeimage.h
+++ b/src/plugins/platforms/windows/qwindowsnativeimage.h
@@ -38,8 +38,6 @@
 
 #include <QtGui/QImage>
 
-#include <QtCore/QtGlobal>
-
 QT_BEGIN_NAMESPACE
 
 class QWindowsNativeImage
diff --git a/src/plugins/platforms/windows/qwindowsnativeinterface.cpp b/src/plugins/platforms/windows/qwindowsnativeinterface.cpp
index 84608edddc..9691156403 100644
--- a/src/plugins/platforms/windows/qwindowsnativeinterface.cpp
+++ b/src/plugins/platforms/windows/qwindowsnativeinterface.cpp
@@ -192,6 +192,11 @@ QString QWindowsNativeInterface::registerWindowClass(const QString &classNameIn,
     return QWindowsContext::instance()->registerWindowClass(classNameIn, (WNDPROC)eventProc);
 }
 
+void QWindowsNativeInterface::beep()
+{
+    MessageBeep(MB_OK);  // For QApplication
+}
+
 bool QWindowsNativeInterface::asyncExpose() const
 {
     return QWindowsContext::instance()->asyncExpose();
diff --git a/src/plugins/platforms/windows/qwindowsnativeinterface.h b/src/plugins/platforms/windows/qwindowsnativeinterface.h
index 4069d60f3b..be8418b769 100644
--- a/src/plugins/platforms/windows/qwindowsnativeinterface.h
+++ b/src/plugins/platforms/windows/qwindowsnativeinterface.h
@@ -34,7 +34,6 @@
 #ifndef QWINDOWSNATIVEINTERFACE_H
 #define QWINDOWSNATIVEINTERFACE_H
 
-#include "qtwindows_additional.h"
 #include <QtGui/qpa/qplatformnativeinterface.h>
 
 QT_BEGIN_NAMESPACE
@@ -73,7 +72,7 @@ public:
 
     Q_INVOKABLE QString registerWindowClass(const QString &classNameIn, void *eventProc) const;
 
-    Q_INVOKABLE void beep() { MessageBeep(MB_OK); } // For QApplication
+    Q_INVOKABLE void beep();
 
     Q_INVOKABLE void registerWindowsMime(void *mimeIn);
     Q_INVOKABLE void unregisterWindowsMime(void *mime);
diff --git a/src/plugins/platforms/windows/qwindowsole.h b/src/plugins/platforms/windows/qwindowsole.h
index b63d7611da..09f6114e2d 100644
--- a/src/plugins/platforms/windows/qwindowsole.h
+++ b/src/plugins/platforms/windows/qwindowsole.h
@@ -36,12 +36,9 @@
 
 #include "qtwindows_additional.h"
 
-#include <QtCore/QObject>
 #include <QtCore/QMap>
-#include <QtCore/QPoint>
 #include <QtCore/QPointer>
 #include <QtCore/QVector>
-#include <QtCore/QRect>
 
 #include <objidl.h>
 
diff --git a/src/plugins/platforms/windows/qwindowsopengltester.h b/src/plugins/platforms/windows/qwindowsopengltester.h
index f58bf305fc..7b6164946e 100644
--- a/src/plugins/platforms/windows/qwindowsopengltester.h
+++ b/src/plugins/platforms/windows/qwindowsopengltester.h
@@ -34,8 +34,6 @@
 #ifndef QWINDOWSOPENGLTESTER_H
 #define QWINDOWSOPENGLTESTER_H
 
-#include <qtwindowsglobal.h>
-
 #include <QtCore/QByteArray>
 #include <QtCore/QFlags>
 #include <private/qversionnumber_p.h>
diff --git a/src/plugins/platforms/windows/qwindowstheme.cpp b/src/plugins/platforms/windows/qwindowstheme.cpp
index 9b6ae7c445..d3f67e9eaa 100644
--- a/src/plugins/platforms/windows/qwindowstheme.cpp
+++ b/src/plugins/platforms/windows/qwindowstheme.cpp
@@ -62,6 +62,7 @@
 #include <QtCore/QTextStream>
 #include <QtCore/QSysInfo>
 #include <QtCore/QCache>
+#include <QtGui/QColor>
 #include <QtGui/QPalette>
 #include <QtGui/QGuiApplication>
 #include <QtGui/QPainter>
@@ -77,6 +78,16 @@
 
 QT_BEGIN_NAMESPACE
 
+static inline COLORREF qColorToCOLORREF(const QColor &color)
+{
+    return RGB(color.red(), color.green(), color.blue());
+}
+
+static inline QColor COLORREFToQColor(COLORREF cr)
+{
+    return QColor(GetRValue(cr), GetGValue(cr), GetBValue(cr));
+}
+
 static inline QTextStream& operator<<(QTextStream &str, const QColor &c)
 {
     str.setIntegerBase(16);
diff --git a/src/plugins/platforms/windows/qwindowstheme.h b/src/plugins/platforms/windows/qwindowstheme.h
index 3840e978cd..b2f8e13b64 100644
--- a/src/plugins/platforms/windows/qwindowstheme.h
+++ b/src/plugins/platforms/windows/qwindowstheme.h
@@ -35,9 +35,6 @@
 #define QWINDOWSTHEME_H
 
 #include <qpa/qplatformtheme.h>
-#include <QtGui/QColor>
-
-#include "qtwindows_additional.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -79,12 +76,6 @@ private:
     QFont *m_fonts[NFonts];
 };
 
-static inline COLORREF qColorToCOLORREF(const QColor &color)
-{ return RGB(color.red(), color.green(), color.blue()); }
-
-static inline QColor COLORREFToQColor(COLORREF cr)
-{ return QColor(GetRValue(cr), GetGValue(cr), GetBValue(cr)); }
-
 QT_END_NAMESPACE
 
 #endif // QWINDOWSTHEME_H
diff --git a/src/plugins/platforms/windows/qwindowswindow.cpp b/src/plugins/platforms/windows/qwindowswindow.cpp
index b229ec4080..b6dbe91ff7 100644
--- a/src/plugins/platforms/windows/qwindowswindow.cpp
+++ b/src/plugins/platforms/windows/qwindowswindow.cpp
@@ -38,6 +38,7 @@
 #include "qwindowsscreen.h"
 #include "qwindowsscaling.h"
 #include "qwindowsintegration.h"
+#include "qwindowsopenglcontext.h"
 #ifdef QT_NO_CURSOR
 #  include "qwindowscursor.h"
 #endif
diff --git a/src/plugins/platforms/windows/qwindowswindow.h b/src/plugins/platforms/windows/qwindowswindow.h
index ec419d8272..b47bd86ab8 100644
--- a/src/plugins/platforms/windows/qwindowswindow.h
+++ b/src/plugins/platforms/windows/qwindowswindow.h
@@ -40,7 +40,6 @@
 #endif
 #include "qwindowsscaling.h"
 #include "qwindowscursor.h"
-#include "qwindowsopenglcontext.h"
 
 #include <qpa/qplatformwindow.h>
 #include <QtPlatformHeaders/qwindowswindowfunctions.h>
-- 
cgit v1.2.3