From 27de80121d96d1bcb44f58a28c0fd6e9ad620a26 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Tue, 22 May 2018 10:28:55 +0200
Subject: [PATCH] Fix Qt include statements

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

Change-Id: Ie8cf4d28fc0ec7f95fe86806e5402173a0c63cb7
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Andre de la Rocha <andre.rocha@qt.io>
---
 src/activeqt/container/qaxselect.cpp   | 14 +++++++-------
 src/activeqt/container/qaxselect.h     |  2 +-
 src/activeqt/container/qaxwidget.h     |  2 +-
 src/activeqt/control/qaxaggregated.cpp |  2 +-
 src/activeqt/control/qaxbindable.h     |  2 +-
 src/activeqt/shared/qaxutils.cpp       | 16 ++++++++--------
 src/activeqt/shared/qaxutils_p.h       |  6 +++---
 7 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/activeqt/container/qaxselect.cpp b/src/activeqt/container/qaxselect.cpp
index 026c86fd..81afa517 100644
--- a/src/activeqt/container/qaxselect.cpp
+++ b/src/activeqt/container/qaxselect.cpp
@@ -52,13 +52,13 @@
 
 #include "ui_qaxselect.h"
 
-#include <QtCore/QFileInfo>
-#include <QtCore/QSortFilterProxyModel>
-#include <QtCore/QItemSelectionModel>
-#include <QtCore/QSysInfo>
-#include <QtCore/QTextStream>
-#include <QtWidgets/QDesktopWidget>
-#include <QtWidgets/QPushButton>
+#include <QtCore/qfileinfo.h>
+#include <QtCore/qsortfilterproxymodel.h>
+#include <QtCore/qitemselectionmodel.h>
+#include <QtCore/qsysinfo.h>
+#include <QtCore/qtextstream.h>
+#include <QtWidgets/qdesktopwidget.h>
+#include <QtWidgets/qpushbutton.h>
 
 #include <qt_windows.h>
 
diff --git a/src/activeqt/container/qaxselect.h b/src/activeqt/container/qaxselect.h
index 8921a17e..54552d9b 100644
--- a/src/activeqt/container/qaxselect.h
+++ b/src/activeqt/container/qaxselect.h
@@ -50,7 +50,7 @@
 
 #ifndef QAXSELECT_H
 #define QAXSELECT_H
-#include <QtWidgets/QDialog>
+#include <QtWidgets/qdialog.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/activeqt/container/qaxwidget.h b/src/activeqt/container/qaxwidget.h
index 3a9f19ea..db1f73a9 100644
--- a/src/activeqt/container/qaxwidget.h
+++ b/src/activeqt/container/qaxwidget.h
@@ -52,7 +52,7 @@
 #define QAXWIDGET_H
 
 #include <ActiveQt/qaxbase.h>
-#include <QtWidgets/QWidget>
+#include <QtWidgets/qwidget.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/activeqt/control/qaxaggregated.cpp b/src/activeqt/control/qaxaggregated.cpp
index 61e858b5..0e95308b 100644
--- a/src/activeqt/control/qaxaggregated.cpp
+++ b/src/activeqt/control/qaxaggregated.cpp
@@ -51,7 +51,7 @@
 #include "qaxaggregated.h"
 
 #ifdef QT_WIDGETS_LIB
-#  include <QtWidgets/QWidget>
+#  include <QtWidgets/qwidget.h>
 #endif
 
 QT_BEGIN_NAMESPACE
diff --git a/src/activeqt/control/qaxbindable.h b/src/activeqt/control/qaxbindable.h
index d2dcc367..1bb3b0c4 100644
--- a/src/activeqt/control/qaxbindable.h
+++ b/src/activeqt/control/qaxbindable.h
@@ -51,7 +51,7 @@
 #ifndef QAXBINDABLE_H
 #define QAXBINDABLE_H
 
-#include <QtWidgets/QWidget>
+#include <QtWidgets/qwidget.h>
 
 struct IUnknown;
 
diff --git a/src/activeqt/shared/qaxutils.cpp b/src/activeqt/shared/qaxutils.cpp
index c41b321f..fb610f57 100644
--- a/src/activeqt/shared/qaxutils.cpp
+++ b/src/activeqt/shared/qaxutils.cpp
@@ -50,19 +50,19 @@
 
 #include "qaxutils_p.h"
 
-#include <QtWidgets/QWidget>
-#include <QtGui/QPixmap>
-#include <QtGui/QRegion>
-#include <QtGui/QWindow>
-#include <QtGui/QGuiApplication>
+#include <QtWidgets/qwidget.h>
+#include <QtGui/qpixmap.h>
+#include <QtGui/qregion.h>
+#include <QtGui/qwindow.h>
+#include <QtGui/qguiapplication.h>
 #include <private/qhighdpiscaling_p.h>
 #include <qpa/qplatformnativeinterface.h>
 #include <qpa/qplatformpixmap.h>
 #include <QtGui/private/qpixmap_raster_p.h>
-#include <QtCore/QScopedArrayPointer>
-#include <QtCore/QRect>
+#include <QtCore/qscopedpointer.h>
+#include <QtCore/qrect.h>
 
-#include <QtCore/QDebug>
+#include <QtCore/qdebug.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/activeqt/shared/qaxutils_p.h b/src/activeqt/shared/qaxutils_p.h
index 2894a575..21dcfebe 100644
--- a/src/activeqt/shared/qaxutils_p.h
+++ b/src/activeqt/shared/qaxutils_p.h
@@ -63,9 +63,9 @@
 //
 
 #include <QtCore/qt_windows.h>
-#include <QtCore/QMetaType>
-#include <QtCore/QPair>
-#include <QtCore/QRect>
+#include <QtCore/qmetatype.h>
+#include <QtCore/qpair.h>
+#include <QtCore/qrect.h>
 
 QT_BEGIN_NAMESPACE
 
-- 
GitLab