From 468e9c13a9a93eeb5efe46f9d388518f949eaf8a Mon Sep 17 00:00:00 2001
From: Fabian Kosmale <fabian.kosmale@qt.io>
Date: Sun, 6 Feb 2022 20:54:00 +0100
Subject: Misc: Do not depend on transitive includes

As a drive-by, remove superfluous includes from qnetworkmanagerservice.h
and obey the coding conventions for includes in a few more places.

Change-Id: I65b68c0cef7598d06a125e97637040392d4be9ff
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/dbus/qdbusintegrator.cpp                                      | 1 +
 src/dbus/qdbusservicewatcher.h                                    | 5 +++++
 src/gui/kernel/qplatformmenu.h                                    | 7 ++++---
 src/gui/rhi/qshader_p.h                                           | 1 +
 src/gui/util/qktxhandler.cpp                                      | 1 +
 src/network/socket/qlocalserver_p.h                               | 1 +
 src/opengl/qopenglframebufferobject_p.h                           | 1 +
 src/opengl/qopenglshaderprogram.h                                 | 1 +
 src/platformsupport/input/evdevtouch/qevdevtouchhandler_p.h       | 1 +
 .../networkinformation/networkmanager/qnetworkmanagerservice.h    | 8 +++++---
 .../compose/qcomposeplatforminputcontext.cpp                      | 1 +
 src/plugins/platforms/android/androidjniaccessibility.cpp         | 1 +
 src/plugins/platforms/android/qandroidplatformtheme.h             | 2 ++
 src/plugins/platforms/cocoa/qcocoaaccessibility.mm                | 1 +
 src/plugins/platforms/cocoa/qcocoaglcontext.h                     | 1 +
 src/plugins/platforms/ios/qiosclipboard.h                         | 1 +
 src/plugins/platforms/qnx/qqnxbuttoneventnotifier.cpp             | 2 ++
 src/plugins/platforms/qnx/qqnxnavigatorpps.cpp                    | 2 ++
 .../platforms/vkkhrdisplay/qvkkhrdisplayvulkaninstance.cpp        | 1 +
 src/plugins/platforms/windows/qwindowsopengltester.cpp            | 1 +
 src/plugins/platforms/windows/qwindowstheme.h                     | 2 ++
 src/plugins/tls/openssl/qsslsocket_openssl_android.cpp            | 2 ++
 src/plugins/tls/openssl/qtlsbackend_openssl.cpp                   | 1 +
 src/plugins/tls/schannel/qtlskey_schannel.cpp                     | 1 +
 src/printsupport/platform/macos/qcocoaprintdevice_p.h             | 1 +
 src/tools/androiddeployqt/main.cpp                                | 3 +++
 src/tools/macdeployqt/shared/shared.cpp                           | 2 ++
 27 files changed, 46 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp
index 138c83ce57..7efd94ac77 100644
--- a/src/dbus/qdbusintegrator.cpp
+++ b/src/dbus/qdbusintegrator.cpp
@@ -50,6 +50,7 @@
 #include <qtimer.h>
 #include <qthread.h>
 #include <private/qlocking_p.h>
+#include <QtCore/qset.h>
 
 #include "qdbusargument.h"
 #include "qdbusconnection_p.h"
diff --git a/src/dbus/qdbusservicewatcher.h b/src/dbus/qdbusservicewatcher.h
index 2d5720d63b..96e892130f 100644
--- a/src/dbus/qdbusservicewatcher.h
+++ b/src/dbus/qdbusservicewatcher.h
@@ -40,12 +40,17 @@
 #ifndef QDBUSSERVICEWATCHER_H
 #define QDBUSSERVICEWATCHER_H
 
+#include <QtCore/QObject>
+#include <QtCore/qcontainerfwd.h> // Q(String)List
 #include <QtDBus/qtdbusglobal.h>
 
 #if !defined(QT_NO_DBUS) && !defined(QT_NO_QOBJECT)
 
 QT_BEGIN_NAMESPACE
 
+class QString;
+template<typename T>
+class QBindable;
 
 class QDBusConnection;
 
diff --git a/src/gui/kernel/qplatformmenu.h b/src/gui/kernel/qplatformmenu.h
index 8e470aefd3..60f6ed81c5 100644
--- a/src/gui/kernel/qplatformmenu.h
+++ b/src/gui/kernel/qplatformmenu.h
@@ -49,13 +49,14 @@
 // source and binary incompatible with future versions of Qt.
 //
 
+#include <QtCore/qobject.h>
 #include <QtGui/qtguiglobal.h>
 #include <QtCore/qpointer.h>
-#include <QtGui/QFont>
+#include <QtGui/qfont.h>
 #if QT_CONFIG(shortcut)
-#  include <QtGui/QKeySequence>
+#  include <QtGui/qkeysequence.h>
 #endif
-#include <QtGui/QIcon>
+#include <QtGui/qicon.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/rhi/qshader_p.h b/src/gui/rhi/qshader_p.h
index 29235c6b0b..77100bdaac 100644
--- a/src/gui/rhi/qshader_p.h
+++ b/src/gui/rhi/qshader_p.h
@@ -52,6 +52,7 @@
 //
 
 #include <QtGui/qtguiglobal.h>
+#include <QtCore/qhash.h>
 #include <private/qshaderdescription_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/gui/util/qktxhandler.cpp b/src/gui/util/qktxhandler.cpp
index 2ab67d7c15..e2030e3ff3 100644
--- a/src/gui/util/qktxhandler.cpp
+++ b/src/gui/util/qktxhandler.cpp
@@ -41,6 +41,7 @@
 #include "qtexturefiledata_p.h"
 #include <QtEndian>
 #include <QSize>
+#include <QMap>
 #include <QtCore/qiodevice.h>
 
 //#define KTX_DEBUG
diff --git a/src/network/socket/qlocalserver_p.h b/src/network/socket/qlocalserver_p.h
index bbaad80254..3a48a3413a 100644
--- a/src/network/socket/qlocalserver_p.h
+++ b/src/network/socket/qlocalserver_p.h
@@ -61,6 +61,7 @@ QT_REQUIRE_CONFIG(localserver);
 
 #if defined(QT_LOCALSOCKET_TCP)
 #   include <qtcpserver.h>
+#   include <QtCore/qmap.h>
 #elif defined(Q_OS_WIN)
 #   include <qt_windows.h>
 #   include <qwineventnotifier.h>
diff --git a/src/opengl/qopenglframebufferobject_p.h b/src/opengl/qopenglframebufferobject_p.h
index 62c541fdc3..7b6869028f 100644
--- a/src/opengl/qopenglframebufferobject_p.h
+++ b/src/opengl/qopenglframebufferobject_p.h
@@ -51,6 +51,7 @@
 // We mean it.
 //
 
+#include <QtCore/qvarlengtharray.h>
 #include <qopenglframebufferobject.h>
 #include <private/qopenglcontext_p.h>
 #include <private/qopenglextensions_p.h>
diff --git a/src/opengl/qopenglshaderprogram.h b/src/opengl/qopenglshaderprogram.h
index 4cbf7e0d3b..1283488d94 100644
--- a/src/opengl/qopenglshaderprogram.h
+++ b/src/opengl/qopenglshaderprogram.h
@@ -40,6 +40,7 @@
 #ifndef QOPENGLSHADERPROGRAM_H
 #define QOPENGLSHADERPROGRAM_H
 
+#include <QtCore/qobject.h>
 #include <QtOpenGL/qtopenglglobal.h>
 
 #include <QtGui/qopengl.h>
diff --git a/src/platformsupport/input/evdevtouch/qevdevtouchhandler_p.h b/src/platformsupport/input/evdevtouch/qevdevtouchhandler_p.h
index 3ad2602811..01de7f9e68 100644
--- a/src/platformsupport/input/evdevtouch/qevdevtouchhandler_p.h
+++ b/src/platformsupport/input/evdevtouch/qevdevtouchhandler_p.h
@@ -57,6 +57,7 @@
 #include <QObject>
 #include <QString>
 #include <QList>
+#include <QHash>
 #include <QThread>
 #include <QtCore/private/qthread_p.h>
 #include <qpa/qwindowsysteminterface.h>
diff --git a/src/plugins/networkinformation/networkmanager/qnetworkmanagerservice.h b/src/plugins/networkinformation/networkmanager/qnetworkmanagerservice.h
index f13ec88ad5..1238b1e287 100644
--- a/src/plugins/networkinformation/networkmanager/qnetworkmanagerservice.h
+++ b/src/plugins/networkinformation/networkmanager/qnetworkmanagerservice.h
@@ -51,9 +51,9 @@
 // We mean it.
 //
 
-#include <QtDBus/QDBusAbstractInterface>
-#include <QtDBus/QDBusPendingCallWatcher>
-#include <QtDBus/QDBusObjectPath>
+#include <QtCore/qvariant.h>
+#include <QtCore/qmap.h>
+#include <QtDBus/qdbusabstractinterface.h>
 
 #include <optional>
 
@@ -74,6 +74,8 @@ enum NMDeviceState {
 
 QT_BEGIN_NAMESPACE
 
+class QDBusObjectPath;
+
 // This tiny class exists for the purpose of seeing if NetworkManager is available without
 // initializing everything the derived/full class needs.
 class QNetworkManagerInterfaceBase : public QDBusAbstractInterface
diff --git a/src/plugins/platforminputcontexts/compose/qcomposeplatforminputcontext.cpp b/src/plugins/platforminputcontexts/compose/qcomposeplatforminputcontext.cpp
index da5235e491..df2be7afe9 100644
--- a/src/plugins/platforminputcontexts/compose/qcomposeplatforminputcontext.cpp
+++ b/src/plugins/platforminputcontexts/compose/qcomposeplatforminputcontext.cpp
@@ -39,6 +39,7 @@
 #include "qcomposeplatforminputcontext.h"
 
 #include <QtCore/QCoreApplication>
+#include <QtCore/qvarlengtharray.h>
 #include <QtGui/QKeyEvent>
 #include <QtGui/QGuiApplication>
 
diff --git a/src/plugins/platforms/android/androidjniaccessibility.cpp b/src/plugins/platforms/android/androidjniaccessibility.cpp
index 807db78ecf..47937d574f 100644
--- a/src/plugins/platforms/android/androidjniaccessibility.cpp
+++ b/src/plugins/platforms/android/androidjniaccessibility.cpp
@@ -51,6 +51,7 @@
 #include <QtCore/QJniObject>
 #include <QtGui/private/qhighdpiscaling_p.h>
 #include <QtCore/QObject>
+#include <QtCore/qvarlengtharray.h>
 
 static const char m_qtTag[] = "Qt A11Y";
 static const char m_classErrorMsg[] = "Can't find class \"%s\"";
diff --git a/src/plugins/platforms/android/qandroidplatformtheme.h b/src/plugins/platforms/android/qandroidplatformtheme.h
index b49d2516f1..087ad95103 100644
--- a/src/plugins/platforms/android/qandroidplatformtheme.h
+++ b/src/plugins/platforms/android/qandroidplatformtheme.h
@@ -43,6 +43,8 @@
 #include <qpa/qplatformtheme.h>
 #include <QtGui/qfont.h>
 #include <QtGui/qpalette.h>
+#include <QtCore/qhash.h>
+#include <QtCore/qbytearray.h>
 
 #include <QJsonObject>
 
diff --git a/src/plugins/platforms/cocoa/qcocoaaccessibility.mm b/src/plugins/platforms/cocoa/qcocoaaccessibility.mm
index 0f5c638f7c..1ec4c5a114 100644
--- a/src/plugins/platforms/cocoa/qcocoaaccessibility.mm
+++ b/src/plugins/platforms/cocoa/qcocoaaccessibility.mm
@@ -42,6 +42,7 @@
 #include "qcocoaaccessibility.h"
 #include "qcocoaaccessibilityelement.h"
 #include <QtGui/qaccessible.h>
+#include <QtCore/qmap.h>
 #include <private/qcore_mac_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/platforms/cocoa/qcocoaglcontext.h b/src/plugins/platforms/cocoa/qcocoaglcontext.h
index 633b9256c8..9d268a0d4a 100644
--- a/src/plugins/platforms/cocoa/qcocoaglcontext.h
+++ b/src/plugins/platforms/cocoa/qcocoaglcontext.h
@@ -41,6 +41,7 @@
 #define QCOCOAGLCONTEXT_H
 
 #include <QtCore/QPointer>
+#include <QtCore/QVarLengthArray>
 #include <QtCore/private/qcore_mac_p.h>
 #include <qpa/qplatformopenglcontext.h>
 #include <QtGui/qopenglcontext.h>
diff --git a/src/plugins/platforms/ios/qiosclipboard.h b/src/plugins/platforms/ios/qiosclipboard.h
index 3fe9b29b71..e14e83e96e 100644
--- a/src/plugins/platforms/ios/qiosclipboard.h
+++ b/src/plugins/platforms/ios/qiosclipboard.h
@@ -40,6 +40,7 @@
 #ifndef QIOSCLIPBOARD_H
 #define QIOSCLIPBOARD_H
 
+#include <QtCore/qmap.h>
 #include <qpa/qplatformclipboard.h>
 
 #ifndef QT_NO_CLIPBOARD
diff --git a/src/plugins/platforms/qnx/qqnxbuttoneventnotifier.cpp b/src/plugins/platforms/qnx/qqnxbuttoneventnotifier.cpp
index f0c4c385ef..f1e7a545f1 100644
--- a/src/plugins/platforms/qnx/qqnxbuttoneventnotifier.cpp
+++ b/src/plugins/platforms/qnx/qqnxbuttoneventnotifier.cpp
@@ -42,6 +42,8 @@
 #include <QtGui/QGuiApplication>
 #include <qpa/qwindowsysteminterface.h>
 
+#include <QtCore/qhash.h>
+#include <QtCore/qbytearray.h>
 #include <QtCore/QDebug>
 #include <QtCore/QMetaEnum>
 #include <QtCore/QSocketNotifier>
diff --git a/src/plugins/platforms/qnx/qqnxnavigatorpps.cpp b/src/plugins/platforms/qnx/qqnxnavigatorpps.cpp
index d5234ca92f..90b244cf55 100644
--- a/src/plugins/platforms/qnx/qqnxnavigatorpps.cpp
+++ b/src/plugins/platforms/qnx/qqnxnavigatorpps.cpp
@@ -40,6 +40,8 @@
 #include "qqnxnavigatorpps.h"
 
 #include <QDebug>
+#include <QHash>
+#include <QByteArray>
 #include <private/qcore_unix_p.h>
 
 #if defined(QQNXNAVIGATOR_DEBUG)
diff --git a/src/plugins/platforms/vkkhrdisplay/qvkkhrdisplayvulkaninstance.cpp b/src/plugins/platforms/vkkhrdisplay/qvkkhrdisplayvulkaninstance.cpp
index c670638b0d..9a7ef65dfc 100644
--- a/src/plugins/platforms/vkkhrdisplay/qvkkhrdisplayvulkaninstance.cpp
+++ b/src/plugins/platforms/vkkhrdisplay/qvkkhrdisplayvulkaninstance.cpp
@@ -38,6 +38,7 @@
 ****************************************************************************/
 
 #include "qvkkhrdisplayvulkaninstance.h"
+#include <QVarLengthArray>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/windows/qwindowsopengltester.cpp b/src/plugins/platforms/windows/qwindowsopengltester.cpp
index e8d10e3555..1c2b357cae 100644
--- a/src/plugins/platforms/windows/qwindowsopengltester.cpp
+++ b/src/plugins/platforms/windows/qwindowsopengltester.cpp
@@ -41,6 +41,7 @@
 #include "qwindowscontext.h"
 
 #include <QtCore/qvariant.h>
+#include <QtCore/qmap.h>
 #include <QtCore/qdebug.h>
 #include <QtCore/qtextstream.h>
 #include <QtCore/qcoreapplication.h>
diff --git a/src/plugins/platforms/windows/qwindowstheme.h b/src/plugins/platforms/windows/qwindowstheme.h
index 9d5fcc92fe..710d1dc686 100644
--- a/src/plugins/platforms/windows/qwindowstheme.h
+++ b/src/plugins/platforms/windows/qwindowstheme.h
@@ -44,6 +44,8 @@
 
 #include <QtCore/qsharedpointer.h>
 #include <QtCore/qvariant.h>
+#include <QtCore/qlist.h>
+#include <QtCore/qsize.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/tls/openssl/qsslsocket_openssl_android.cpp b/src/plugins/tls/openssl/qsslsocket_openssl_android.cpp
index 1c11377c0e..e1cda20aea 100644
--- a/src/plugins/tls/openssl/qsslsocket_openssl_android.cpp
+++ b/src/plugins/tls/openssl/qsslsocket_openssl_android.cpp
@@ -54,6 +54,8 @@
 
 #include <QtCore/QJniEnvironment>
 #include <QtCore/QJniObject>
+#include <QtCore/QList>
+#include <QtCore/QByteArray>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/tls/openssl/qtlsbackend_openssl.cpp b/src/plugins/tls/openssl/qtlsbackend_openssl.cpp
index 9acac9b9d1..6a25163162 100644
--- a/src/plugins/tls/openssl/qtlsbackend_openssl.cpp
+++ b/src/plugins/tls/openssl/qtlsbackend_openssl.cpp
@@ -57,6 +57,7 @@
 #include <QtCore/qlist.h>
 #include <QtCore/qmutex.h>
 #include <QtCore/qscopeguard.h>
+#include <QtCore/qset.h>
 
 #include "qopenssl_p.h"
 
diff --git a/src/plugins/tls/schannel/qtlskey_schannel.cpp b/src/plugins/tls/schannel/qtlskey_schannel.cpp
index 5004cd9c55..586b9c3eae 100644
--- a/src/plugins/tls/schannel/qtlskey_schannel.cpp
+++ b/src/plugins/tls/schannel/qtlskey_schannel.cpp
@@ -51,6 +51,7 @@
 
 #include <QtCore/qscopeguard.h>
 #include <QtCore/qbytearray.h>
+#include <QtCore/qvarlengtharray.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/printsupport/platform/macos/qcocoaprintdevice_p.h b/src/printsupport/platform/macos/qcocoaprintdevice_p.h
index 33b96f6ec4..902a0344d3 100644
--- a/src/printsupport/platform/macos/qcocoaprintdevice_p.h
+++ b/src/printsupport/platform/macos/qcocoaprintdevice_p.h
@@ -56,6 +56,7 @@
 
 #ifndef QT_NO_PRINTER
 
+#include <QtCore/qhash.h>
 #include <ApplicationServices/ApplicationServices.h>
 
 #include <QtPrintSupport/qtprintsupportglobal.h>
diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp
index 70cefcb85d..d80d1ff598 100644
--- a/src/tools/androiddeployqt/main.cpp
+++ b/src/tools/androiddeployqt/main.cpp
@@ -42,6 +42,9 @@
 #include <QElapsedTimer>
 #include <QRegularExpression>
 #include <QSettings>
+#include <QHash>
+#include <QSet>
+#include <QMap>
 
 #include <depfile_shared.h>
 
diff --git a/src/tools/macdeployqt/shared/shared.cpp b/src/tools/macdeployqt/shared/shared.cpp
index 584b541c9a..3c0cea2d65 100644
--- a/src/tools/macdeployqt/shared/shared.cpp
+++ b/src/tools/macdeployqt/shared/shared.cpp
@@ -34,6 +34,8 @@
 #include <QProcess>
 #include <QDir>
 #include <QSet>
+#include <QVariant>
+#include <QVariantMap>
 #include <QStack>
 #include <QDirIterator>
 #include <QLibraryInfo>
-- 
cgit v1.2.3