Fix Qt include statements

Change
 #include <QtCore/QDebug>, #include <QDebug>
to
 #include <QtCore/qdebug.h>
according to the coding style.

Change-Id: I45fa5e55222e6913972d743908c47480b23cd92c
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>

16 files changed, 51 insertions, 52 deletions

diff --git a/src/imports/winextras/plugin.cpp b/src/imports/winextras/plugin.cpp
index 60d2525..a2009b0 100644
--- a/src/imports/winextras/plugin.cpp
+++ b/src/imports/winextras/plugin.cpp
@@ -47,7 +47,7 @@
 #include "qquickthumbnailtoolbutton_p.h"
 #include "qquickwin_p.h"
 
-#include <QtQml/QtQml>
+#include <QtQml/qqmlextensionplugin.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/winextras/qwineventfilter.cpp b/src/winextras/qwineventfilter.cpp
index 4ec3bdc..be9add4 100644
--- a/src/winextras/qwineventfilter.cpp
+++ b/src/winextras/qwineventfilter.cpp
@@ -40,8 +40,8 @@
 #include "qwineventfilter_p.h"
 #include "qwinfunctions.h"
 #include "qwinevent.h"
-#include <QGuiApplication>
-#include <QWindow>
+#include <QtGui/qguiapplication.h>
+#include <QtGui/qwindow.h>
 
 #ifndef WM_DWMCOLORIZATIONCOLORCHANGED
 #   define WM_DWMCOLORIZATIONCOLORCHANGED 0x0320
diff --git a/src/winextras/qwineventfilter_p.h b/src/winextras/qwineventfilter_p.h
index 21bb5c5..12b9d58 100644
--- a/src/winextras/qwineventfilter_p.h
+++ b/src/winextras/qwineventfilter_p.h
@@ -52,8 +52,8 @@
 //
 
 #include <QtWinExtras/qwinextrasglobal.h>
-#include <QAbstractNativeEventFilter>
-#include <qt_windows.h>
+#include <QtCore/qabstractnativeeventfilter.h>
+#include <QtCore/qt_windows.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/winextras/qwinfunctions.cpp b/src/winextras/qwinfunctions.cpp
index 7089966..82fd25b 100644
--- a/src/winextras/qwinfunctions.cpp
+++ b/src/winextras/qwinfunctions.cpp
@@ -50,15 +50,15 @@
 #include "qwineventfilter_p.h"
 #include "windowsguidsdefs_p.h"
 
-#include <QGuiApplication>
-#include <QWindow>
-#include <QSettings>
-#include <QPixmap>
-#include <QBitmap>
-#include <QImage>
-#include <QColor>
-#include <QRegion>
-#include <QMargins>
+#include <QtGui/qguiapplication.h>
+#include <QtGui/qwindow.h>
+#include <QtGui/qpixmap.h>
+#include <QtGui/qbitmap.h>
+#include <QtGui/qimage.h>
+#include <QtGui/qcolor.h>
+#include <QtGui/qregion.h>
+#include <QtCore/qmargins.h>
+#include <QtCore/qsettings.h>
 
 #include <comdef.h>
 #include "winshobjidl_p.h"
diff --git a/src/winextras/qwinfunctions_p.h b/src/winextras/qwinfunctions_p.h
index a69e52c..3aad7bc 100644
--- a/src/winextras/qwinfunctions_p.h
+++ b/src/winextras/qwinfunctions_p.h
@@ -51,8 +51,8 @@
 // We mean it.
 //
 
-#include <QString>
-#include <qt_windows.h>
+#include <QtCore/qstring.h>
+#include <QtCore/qt_windows.h>
 #include <uxtheme.h>
 #include <dwmapi.h>
 
diff --git a/src/winextras/qwinjumplist.cpp b/src/winextras/qwinjumplist.cpp
index 94b8e81..19a63a6 100644
--- a/src/winextras/qwinjumplist.cpp
+++ b/src/winextras/qwinjumplist.cpp
@@ -38,7 +38,7 @@
  **
  ****************************************************************************/
 
-#include <QtCore/QtGlobal>
+#include <QtCore/qglobal.h>
 
 #ifdef Q_CC_MINGW // MinGW: Enable SHCreateItemFromParsingName()
 #  if defined(_WIN32_IE) && _WIN32_IE < 0x0700 // _WIN32_IE_IE70
@@ -57,11 +57,11 @@
 #include "windowsguidsdefs_p.h"
 #include "winpropkey_p.h"
 
-#include <QDir>
-#include <QtCore/QDebug>
-#include <QCoreApplication>
-#include <QRegularExpression>
-#include <qt_windows.h>
+#include <QtCore/qdir.h>
+#include <QtCore/qdebug.h>
+#include <QtCore/qcoreapplication.h>
+#include <QtCore/qregularexpression.h>
+#include <QtCore/qt_windows.h>
 #include <propvarutil.h>
 
 #include "qwinfunctions.h"
diff --git a/src/winextras/qwinjumplistcategory.cpp b/src/winextras/qwinjumplistcategory.cpp
index 4410c9c..721a78c 100644
--- a/src/winextras/qwinjumplistcategory.cpp
+++ b/src/winextras/qwinjumplistcategory.cpp
@@ -38,7 +38,7 @@
  **
  ****************************************************************************/
 
-#include <QtCore/QtGlobal>
+#include <QtCore/qglobal.h>
 
 #ifdef Q_CC_MINGW // MinGW: Include the correct definition of SHARDAPPIDINFOLINK
 #  if defined(NTDDI_VERSION) && NTDDI_VERSION < 0x06010000
@@ -57,7 +57,7 @@
 #include "winshobjidl_p.h"
 #include "windowsguidsdefs_p.h"
 
-#include <QtCore/QDebug>
+#include <QtCore/qdebug.h>
 
 #include <shlobj.h>
 
diff --git a/src/winextras/qwinjumplistitem.cpp b/src/winextras/qwinjumplistitem.cpp
index e20366b..7357892 100644
--- a/src/winextras/qwinjumplistitem.cpp
+++ b/src/winextras/qwinjumplistitem.cpp
@@ -42,8 +42,8 @@
 #include "qwinjumplistitem_p.h"
 #include "qwinjumplistcategory_p.h"
 
-#include <QtCore/QDebug>
-#include <QtCore/QDir>
+#include <QtCore/qdebug.h>
+#include <QtCore/qdir.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/winextras/qwinmime.cpp b/src/winextras/qwinmime.cpp
index 0239dca..f0f5232 100644
--- a/src/winextras/qwinmime.cpp
+++ b/src/winextras/qwinmime.cpp
@@ -39,11 +39,11 @@
 
 #include "qwinmime.h"
 
-#include <QtGui/QGuiApplication>
-#include <QtCore/QMetaObject>
-#include <QtCore/QDebug>
+#include <QtGui/qguiapplication.h>
+#include <QtCore/qmetaobject.h>
+#include <QtCore/qdebug.h>
 
-#include <qpa/qplatformnativeinterface.h>
+#include <QtGui/qpa/qplatformnativeinterface.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/winextras/qwinmime.h b/src/winextras/qwinmime.h
index 44d7c07..f9c450f 100644
--- a/src/winextras/qwinmime.h
+++ b/src/winextras/qwinmime.h
@@ -43,9 +43,9 @@
 #include <QtWinExtras/qwinextrasglobal.h>
 
 #include <QtCore/qt_windows.h>
-#include <QtCore/QVector>
-#include <QtCore/QList>
-#include <QtCore/QVariant>
+#include <QtCore/qvector.h>
+#include <QtCore/qlist.h>
+#include <QtCore/qvariant.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/winextras/qwintaskbarbutton.cpp b/src/winextras/qwintaskbarbutton.cpp
index cedca35..2516865 100644
--- a/src/winextras/qwintaskbarbutton.cpp
+++ b/src/winextras/qwintaskbarbutton.cpp
@@ -48,9 +48,9 @@
 #include "winshobjidl_p.h"
 #include "windowsguidsdefs_p.h"
 
-#include <QWindow>
-#include <QIcon>
-#include <QPair>
+#include <QtGui/qwindow.h>
+#include <QtGui/qicon.h>
+#include <QtCore/qpair.h>
 #include <dwmapi.h>
 #include <shobjidl.h>
 
diff --git a/src/winextras/qwintaskbarbutton_p.h b/src/winextras/qwintaskbarbutton_p.h
index a64f3ac..ceafe47 100644
--- a/src/winextras/qwintaskbarbutton_p.h
+++ b/src/winextras/qwintaskbarbutton_p.h
@@ -53,9 +53,9 @@
 
 #include "qwintaskbarbutton.h"
 
-#include <QWindow>
-#include <QPointer>
-#include <qt_windows.h>
+#include <QtGui/qwindow.h>
+#include <QtCore/qpointer.h>
+#include <QtCore/qt_windows.h>
 
 struct ITaskbarList4;
 
diff --git a/src/winextras/qwinthumbnailtoolbar.cpp b/src/winextras/qwinthumbnailtoolbar.cpp
index 39622d1..244520a 100644
--- a/src/winextras/qwinthumbnailtoolbar.cpp
+++ b/src/winextras/qwinthumbnailtoolbar.cpp
@@ -52,13 +52,12 @@
 #include "windowsguidsdefs_p.h"
 #include "qwinfunctions.h"
 
-#include <QWindow>
-#include <QCoreApplication>
-#include <QTimer>
-#include <QDebug>
+#include <QtGui/qwindow.h>
+#include <QtCore/qcoreapplication.h>
+#include <QtCore/qtimer.h>
+#include <QtCore/qdebug.h>
 
 #include "qwinevent.h"
-#include "qwinfunctions.h"
 #include "qwinfunctions_p.h"
 #include "qwineventfilter_p.h"
 
diff --git a/src/winextras/qwinthumbnailtoolbar_p.h b/src/winextras/qwinthumbnailtoolbar_p.h
index dc9fe5b..38d210b 100644
--- a/src/winextras/qwinthumbnailtoolbar_p.h
+++ b/src/winextras/qwinthumbnailtoolbar_p.h
@@ -53,11 +53,11 @@
 
 #include "qwinthumbnailtoolbar.h"
 
-#include <QtCore/QHash>
-#include <QtCore/QList>
-#include <QtGui/QIcon>
-#include <QtGui/QPixmap>
-#include <QtCore/QAbstractNativeEventFilter>
+#include <QtCore/qhash.h>
+#include <QtCore/qlist.h>
+#include <QtGui/qicon.h>
+#include <QtGui/qpixmap.h>
+#include <QtCore/qabstractnativeeventfilter.h>
 
 #include "winshobjidl_p.h"
 
diff --git a/src/winextras/windowsguidsdefs_p.h b/src/winextras/windowsguidsdefs_p.h
index d0e0788..73dc0e7 100644
--- a/src/winextras/windowsguidsdefs_p.h
+++ b/src/winextras/windowsguidsdefs_p.h
@@ -51,8 +51,8 @@
 // We mean it.
 //
 
-#include <QtGlobal>
-#include <qt_windows.h>
+#include <QtCore/qglobal.h>
+#include <QtCore/qt_windows.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/winextras/winpropkey_p.h b/src/winextras/winpropkey_p.h
index 7e89970..53646fc 100644
--- a/src/winextras/winpropkey_p.h
+++ b/src/winextras/winpropkey_p.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <QtGlobal>
+#include <QtCore/qglobal.h>
 #include <propkey.h>
 
 QT_BEGIN_NAMESPACE