Replace unnecessary includes with forward declarations

Change-Id: I4e5d627ae1832f6db63decfe1df4309bee938972
Reviewed-by: Katja Marttila <katja.marttila@qt.io>

11 files changed, 37 insertions, 24 deletions

diff --git a/src/libs/installer/commandlineparser.cpp b/src/libs/installer/commandlineparser.cpp
index 4bfc4ad3a..67fc669e1 100644
--- a/src/libs/installer/commandlineparser.cpp
+++ b/src/libs/installer/commandlineparser.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-** Copyright (C) 2021 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Installer Framework.
@@ -28,6 +28,7 @@
 
 #include "commandlineparser.h"
 
+#include "commandlineparser_p.h"
 #include "constants.h"
 #include "globals.h"
 
diff --git a/src/libs/installer/commandlineparser.h b/src/libs/installer/commandlineparser.h
index 8f112fcb9..f1bedf92e 100644
--- a/src/libs/installer/commandlineparser.h
+++ b/src/libs/installer/commandlineparser.h
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-** Copyright (C) 2021 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Installer Framework.
@@ -29,10 +29,10 @@
 #ifndef COMMANDLINEPARSER_H
 #define COMMANDLINEPARSER_H
 
-#include "commandlineparser_p.h"
-
 #include <QCommandLineParser>
 
+class CommandLineParserPrivate;
+
 class CommandLineParser
 {
 public:
@@ -59,7 +59,7 @@ public:
 
 private:
     QCommandLineParser m_parser;
-    class CommandLineParserPrivate *const d;
+    CommandLineParserPrivate *const d;
 
     QHash<QString, OptionContextFlags> m_optionContextFlagsNameHash;
 };
diff --git a/src/libs/installer/libarchivewrapper.cpp b/src/libs/installer/libarchivewrapper.cpp
index 9fbbeb889..e96cce9a9 100644
--- a/src/libs/installer/libarchivewrapper.cpp
+++ b/src/libs/installer/libarchivewrapper.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-** Copyright (C) 2021 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Installer Framework.
@@ -27,6 +27,7 @@
 **************************************************************************/
 
 #include "libarchivewrapper.h"
+#include "libarchivewrapper_p.h"
 
 namespace QInstaller {
 
diff --git a/src/libs/installer/libarchivewrapper.h b/src/libs/installer/libarchivewrapper.h
index c638d10dc..f5262f9a7 100644
--- a/src/libs/installer/libarchivewrapper.h
+++ b/src/libs/installer/libarchivewrapper.h
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-** Copyright (C) 2021 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Installer Framework.
@@ -31,10 +31,11 @@
 
 #include "installer_global.h"
 #include "abstractarchive.h"
-#include "libarchivewrapper_p.h"
 
 namespace QInstaller {
 
+class LibArchiveWrapperPrivate;
+
 class INSTALLER_EXPORT LibArchiveWrapper : public AbstractArchive
 {
     Q_OBJECT
diff --git a/src/libs/installer/loggingutils.cpp b/src/libs/installer/loggingutils.cpp
index e0bff7b2b..9420830f4 100644
--- a/src/libs/installer/loggingutils.cpp
+++ b/src/libs/installer/loggingutils.cpp
@@ -29,7 +29,6 @@
 #include "loggingutils.h"
 
 #include "component.h"
-#include "localpackagehub.h"
 #include "globals.h"
 #include "fileutils.h"
 #include "remoteclient.h"
diff --git a/src/libs/installer/loggingutils.h b/src/libs/installer/loggingutils.h
index 06f0400f8..246871fb6 100644
--- a/src/libs/installer/loggingutils.h
+++ b/src/libs/installer/loggingutils.h
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-** Copyright (C) 2021 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Installer Framework.
@@ -29,12 +29,18 @@
 #ifndef LOGGINGUTILS_H
 #define LOGGINGUTILS_H
 
-#include "component.h"
+#include "qinstallerglobal.h"
+#include "localpackagehub.h"
 
 #include <QObject>
+#include <QIODevice>
+#include <QTextStream>
+#include <QBuffer>
 
 namespace QInstaller {
 
+class Component;
+
 class INSTALLER_EXPORT LoggingHandler
 {
     Q_DISABLE_COPY(LoggingHandler)
diff --git a/src/libs/installer/performinstallationform.cpp b/src/libs/installer/performinstallationform.cpp
index f1b4300bf..81790cbc2 100644
--- a/src/libs/installer/performinstallationform.cpp
+++ b/src/libs/installer/performinstallationform.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-** Copyright (C) 2021 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Installer Framework.
@@ -30,6 +30,7 @@
 
 #include "progresscoordinator.h"
 #include "globals.h"
+#include "aspectratiolabel.h"
 
 #include <QApplication>
 #include <QLabel>
@@ -39,6 +40,7 @@
 #include <QVBoxLayout>
 #include <QImageReader>
 #include <QScrollArea>
+#include <QTextEdit>
 
 #include <QtCore/QTimer>
 
diff --git a/src/libs/installer/performinstallationform.h b/src/libs/installer/performinstallationform.h
index d67f6ac4b..6c5c3ee70 100644
--- a/src/libs/installer/performinstallationform.h
+++ b/src/libs/installer/performinstallationform.h
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-** Copyright (C) 2020 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Installer Framework.
@@ -29,10 +29,7 @@
 #ifndef PERFORMINSTALLATIONFORM_H
 #define PERFORMINSTALLATIONFORM_H
 
-#include "aspectratiolabel.h"
-
 #include <QObject>
-#include <QTextEdit>
 
 QT_BEGIN_NAMESPACE
 class QLabel;
@@ -42,11 +39,14 @@ class QTimer;
 class QWidget;
 class QWinTaskbarButton;
 class QScrollArea;
+class QTextEdit;
 QT_END_NAMESPACE
 
 
 namespace QInstaller {
 
+class AspectRatioLabel;
+
 class PerformInstallationForm : public QObject
 {
     Q_OBJECT
diff --git a/src/libs/installer/remoteserverconnection.h b/src/libs/installer/remoteserverconnection.h
index ccb8e153d..253360db4 100644
--- a/src/libs/installer/remoteserverconnection.h
+++ b/src/libs/installer/remoteserverconnection.h
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Installer Framework.
@@ -29,8 +29,6 @@
 #ifndef REMOTESERVERCONNECTION_H
 #define REMOTESERVERCONNECTION_H
 
-#include "abstractarchive.h"
-
 #include <QPointer>
 #include <QThread>
 
@@ -44,6 +42,7 @@ QT_END_NAMESPACE
 namespace QInstaller {
 
 class PermissionSettings;
+class AbstractArchive;
 
 class QProcessSignalReceiver;
 class AbstractArchiveSignalReceiver;
diff --git a/src/libs/installer/scriptengine.cpp b/src/libs/installer/scriptengine.cpp
index c8fc65d34..26fe79646 100644
--- a/src/libs/installer/scriptengine.cpp
+++ b/src/libs/installer/scriptengine.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-** Copyright (C) 2021 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Installer Framework.
@@ -32,6 +32,8 @@
 #include "scriptengine_p.h"
 #include "systeminfo.h"
 #include "loggingutils.h"
+#include "packagemanagergui.h"
+#include "component.h"
 
 #include <QMetaEnum>
 #include <QQmlEngine>
diff --git a/src/libs/installer/scriptengine_p.h b/src/libs/installer/scriptengine_p.h
index e5c39663c..a0936fe75 100644
--- a/src/libs/installer/scriptengine_p.h
+++ b/src/libs/installer/scriptengine_p.h
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-** Copyright (C) 2021 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Installer Framework.
@@ -29,18 +29,20 @@
 #ifndef SCRIPTENGINE_P_H
 #define SCRIPTENGINE_P_H
 
-#include "component.h"
-#include "packagemanagercore.h"
-#include "packagemanagergui.h"
 #include "globals.h"
 
 #include <QDebug>
 #include <QDesktopServices>
 #include <QFileDialog>
 #include <QStandardPaths>
+#include <QJSValue>
 
 namespace QInstaller {
 
+class PackageManagerCore;
+class PackageManagerGui;
+class ScriptEngine;
+
 class ConsoleProxy : public QObject
 {
     Q_OBJECT