RemoteLinux: Add more forward declarations

Change-Id: Ie1182248e3b423ce3b85a2baf0c2d7be74de1126
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

25 files changed, 44 insertions, 30 deletions

diff --git a/src/plugins/boot2qt/qdbmakedefaultappstep.cpp b/src/plugins/boot2qt/qdbmakedefaultappstep.cpp
index 59392cb4aa..008230028a 100644
--- a/src/plugins/boot2qt/qdbmakedefaultappstep.cpp
+++ b/src/plugins/boot2qt/qdbmakedefaultappstep.cpp
@@ -31,6 +31,7 @@
 #include <projectexplorer/runconfigurationaspects.h>
 #include <projectexplorer/target.h>
 
+#include <remotelinux/abstractremotelinuxdeployservice.h>
 #include <remotelinux/abstractremotelinuxdeploystep.h>
 
 #include <utils/commandline.h>
diff --git a/src/plugins/boot2qt/qdbstopapplicationstep.cpp b/src/plugins/boot2qt/qdbstopapplicationstep.cpp
index 58071f4f8d..106685b426 100644
--- a/src/plugins/boot2qt/qdbstopapplicationstep.cpp
+++ b/src/plugins/boot2qt/qdbstopapplicationstep.cpp
@@ -33,6 +33,7 @@
 #include <projectexplorer/runcontrol.h>
 #include <projectexplorer/target.h>
 
+#include <remotelinux/abstractremotelinuxdeployservice.h>
 #include <remotelinux/abstractremotelinuxdeploystep.h>
 
 #include <utils/qtcprocess.h>
diff --git a/src/plugins/remotelinux/abstractremotelinuxdeployservice.cpp b/src/plugins/remotelinux/abstractremotelinuxdeployservice.cpp
index f4ff1cef25..aee4d2eec5 100644
--- a/src/plugins/remotelinux/abstractremotelinuxdeployservice.cpp
+++ b/src/plugins/remotelinux/abstractremotelinuxdeployservice.cpp
@@ -24,6 +24,7 @@
 ****************************************************************************/
 
 #include "abstractremotelinuxdeployservice.h"
+
 #include "deploymenttimeinfo.h"
 
 #include <projectexplorer/deployablefile.h>
diff --git a/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp b/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp
index ba6c827d87..b23f724433 100644
--- a/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp
+++ b/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp
@@ -26,7 +26,6 @@
 #include "abstractremotelinuxdeploystep.h"
 
 #include "abstractremotelinuxdeployservice.h"
-#include "remotelinuxdeployconfiguration.h"
 
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/kitinformation.h>
diff --git a/src/plugins/remotelinux/abstractremotelinuxdeploystep.h b/src/plugins/remotelinux/abstractremotelinuxdeploystep.h
index 14d84a4f59..2f72c68f55 100644
--- a/src/plugins/remotelinux/abstractremotelinuxdeploystep.h
+++ b/src/plugins/remotelinux/abstractremotelinuxdeploystep.h
@@ -27,12 +27,13 @@
 
 #include "remotelinux_export.h"
 
-#include "abstractremotelinuxdeployservice.h"
-
 #include <projectexplorer/buildstep.h>
 
 namespace RemoteLinux {
 
+class AbstractRemoteLinuxDeployService;
+class CheckResult;
+
 namespace Internal { class AbstractRemoteLinuxDeployStepPrivate; }
 
 class REMOTELINUX_EXPORT AbstractRemoteLinuxDeployStep : public ProjectExplorer::BuildStep
diff --git a/src/plugins/remotelinux/checkforfreediskspacestep.h b/src/plugins/remotelinux/checkforfreediskspacestep.h
index 1bbdacfa61..e1ff4c3765 100644
--- a/src/plugins/remotelinux/checkforfreediskspacestep.h
+++ b/src/plugins/remotelinux/checkforfreediskspacestep.h
@@ -25,6 +25,8 @@
 
 #pragma once
 
+#include "remotelinux_export.h"
+
 #include "abstractremotelinuxdeploystep.h"
 
 namespace RemoteLinux {
diff --git a/src/plugins/remotelinux/customcommanddeploystep.cpp b/src/plugins/remotelinux/customcommanddeploystep.cpp
index 6b5b91ef1c..318d5cd7a4 100644
--- a/src/plugins/remotelinux/customcommanddeploystep.cpp
+++ b/src/plugins/remotelinux/customcommanddeploystep.cpp
@@ -25,6 +25,7 @@
 
 #include "customcommanddeploystep.h"
 
+#include "abstractremotelinuxdeployservice.h"
 #include "remotelinux_constants.h"
 
 #include <projectexplorer/devicesupport/idevice.h>
diff --git a/src/plugins/remotelinux/customcommanddeploystep.h b/src/plugins/remotelinux/customcommanddeploystep.h
index 797fc90606..0a9503d666 100644
--- a/src/plugins/remotelinux/customcommanddeploystep.h
+++ b/src/plugins/remotelinux/customcommanddeploystep.h
@@ -25,6 +25,8 @@
 
 #pragma once
 
+#include "remotelinux_export.h"
+
 #include "abstractremotelinuxdeploystep.h"
 
 namespace RemoteLinux {
diff --git a/src/plugins/remotelinux/deploymenttimeinfo.h b/src/plugins/remotelinux/deploymenttimeinfo.h
index 01b6405503..202d97aebb 100644
--- a/src/plugins/remotelinux/deploymenttimeinfo.h
+++ b/src/plugins/remotelinux/deploymenttimeinfo.h
@@ -27,6 +27,10 @@
 
 #include <QVariantMap>
 
+QT_BEGIN_NAMESPACE
+class QDateTime;
+QT_END_NAMESPACE
+
 namespace ProjectExplorer {
 class DeployableFile;
 class Kit;
diff --git a/src/plugins/remotelinux/filesystemaccess_test.h b/src/plugins/remotelinux/filesystemaccess_test.h
index 64f07b289c..652a9ee452 100644
--- a/src/plugins/remotelinux/filesystemaccess_test.h
+++ b/src/plugins/remotelinux/filesystemaccess_test.h
@@ -27,8 +27,6 @@
 
 #include <projectexplorer/devicesupport/idevicefactory.h>
 
-#include <utils/fileutils.h>
-
 namespace RemoteLinux {
 namespace Internal {
 
diff --git a/src/plugins/remotelinux/genericdirectuploadservice.h b/src/plugins/remotelinux/genericdirectuploadservice.h
index ffbd9fc866..a426481f1f 100644
--- a/src/plugins/remotelinux/genericdirectuploadservice.h
+++ b/src/plugins/remotelinux/genericdirectuploadservice.h
@@ -25,13 +25,16 @@
 
 #pragma once
 
-#include "abstractremotelinuxdeployservice.h"
 #include "remotelinux_export.h"
 
+#include "abstractremotelinuxdeployservice.h"
+
 #include <QList>
 
-QT_FORWARD_DECLARE_CLASS(QDateTime)
-QT_FORWARD_DECLARE_CLASS(QString)
+QT_BEGIN_NAMESPACE
+class QDateTime;
+class QString;
+QT_END_NAMESPACE
 
 namespace ProjectExplorer { class DeployableFile; }
 namespace Utils { class QtcProcess; }
diff --git a/src/plugins/remotelinux/genericdirectuploadstep.h b/src/plugins/remotelinux/genericdirectuploadstep.h
index ef5e429fb8..595d74c854 100644
--- a/src/plugins/remotelinux/genericdirectuploadstep.h
+++ b/src/plugins/remotelinux/genericdirectuploadstep.h
@@ -25,9 +25,10 @@
 
 #pragma once
 
-#include "abstractremotelinuxdeploystep.h"
 #include "remotelinux_export.h"
 
+#include "abstractremotelinuxdeploystep.h"
+
 namespace RemoteLinux {
 
 class REMOTELINUX_EXPORT GenericDirectUploadStep : public AbstractRemoteLinuxDeployStep
diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.h b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.h
index fba1e2d497..241347aa1b 100644
--- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.h
+++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.h
@@ -25,10 +25,10 @@
 
 #pragma once
 
-#include <projectexplorer/devicesupport/idevicewidget.h>
-
 #include "remotelinux_export.h"
 
+#include <projectexplorer/devicesupport/idevicewidget.h>
+
 namespace Utils { class FilePath; }
 
 namespace RemoteLinux {
diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardpages.h b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardpages.h
index a16e846fcf..2fa8e0d01c 100644
--- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardpages.h
+++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardpages.h
@@ -25,9 +25,10 @@
 
 #pragma once
 
-#include "linuxdevice.h"
 #include "remotelinux_export.h"
 
+#include "linuxdevice.h"
+
 #include <QWizardPage>
 
 namespace RemoteLinux {
diff --git a/src/plugins/remotelinux/killappstep.cpp b/src/plugins/remotelinux/killappstep.cpp
index cb5bc06a79..03d40e3166 100644
--- a/src/plugins/remotelinux/killappstep.cpp
+++ b/src/plugins/remotelinux/killappstep.cpp
@@ -25,6 +25,7 @@
 
 #include "killappstep.h"
 
+#include "abstractremotelinuxdeployservice.h"
 #include "remotelinux_constants.h"
 
 #include <projectexplorer/devicesupport/idevice.h>
diff --git a/src/plugins/remotelinux/killappstep.h b/src/plugins/remotelinux/killappstep.h
index 62fbc81643..f26161e26a 100644
--- a/src/plugins/remotelinux/killappstep.h
+++ b/src/plugins/remotelinux/killappstep.h
@@ -25,6 +25,8 @@
 
 #pragma once
 
+#include "remotelinux_export.h"
+
 #include "abstractremotelinuxdeploystep.h"
 
 namespace RemoteLinux {
diff --git a/src/plugins/remotelinux/linuxdevicetester.h b/src/plugins/remotelinux/linuxdevicetester.h
index 2906a51b67..890484a870 100644
--- a/src/plugins/remotelinux/linuxdevicetester.h
+++ b/src/plugins/remotelinux/linuxdevicetester.h
@@ -27,9 +27,9 @@
 
 #include "remotelinux_export.h"
 
-#include <projectexplorer/devicesupport/filetransferinterface.h>
 #include <projectexplorer/devicesupport/idevice.h>
 
+namespace ProjectExplorer { enum class FileTransferMethod; }
 namespace Utils { class ProcessResultData; }
 
 namespace RemoteLinux {
diff --git a/src/plugins/remotelinux/remotelinuxdeployconfiguration.h b/src/plugins/remotelinux/remotelinuxdeployconfiguration.h
index 723c6b3038..264d28e1e4 100644
--- a/src/plugins/remotelinux/remotelinuxdeployconfiguration.h
+++ b/src/plugins/remotelinux/remotelinuxdeployconfiguration.h
@@ -25,9 +25,6 @@
 
 #pragma once
 
-#include "remotelinux_export.h"
-
-#include <projectexplorer/buildsteplist.h>
 #include <projectexplorer/deployconfiguration.h>
 
 namespace RemoteLinux {
diff --git a/src/plugins/remotelinux/remotelinuxenvironmentaspectwidget.cpp b/src/plugins/remotelinux/remotelinuxenvironmentaspectwidget.cpp
index 53b4aa8fee..a301637104 100644
--- a/src/plugins/remotelinux/remotelinuxenvironmentaspectwidget.cpp
+++ b/src/plugins/remotelinux/remotelinuxenvironmentaspectwidget.cpp
@@ -26,7 +26,7 @@
 #include "remotelinuxenvironmentaspectwidget.h"
 
 #include "linuxdevice.h"
-#include "remotelinuxrunconfiguration.h"
+#include "remotelinuxenvironmentaspect.h"
 #include "remotelinuxenvironmentreader.h"
 
 #include <coreplugin/icore.h>
diff --git a/src/plugins/remotelinux/remotelinuxenvironmentaspectwidget.h b/src/plugins/remotelinux/remotelinuxenvironmentaspectwidget.h
index e31c85b9a3..1f65d59423 100644
--- a/src/plugins/remotelinux/remotelinuxenvironmentaspectwidget.h
+++ b/src/plugins/remotelinux/remotelinuxenvironmentaspectwidget.h
@@ -25,14 +25,16 @@
 
 #pragma once
 
-#include "remotelinuxenvironmentaspect.h"
-
 #include <projectexplorer/environmentaspectwidget.h>
 
-QT_FORWARD_DECLARE_CLASS(QPushButton)
+QT_BEGIN_NAMESPACE
+class QPushButton;
+QT_END_NAMESPACE
 
 namespace RemoteLinux {
 
+class RemoteLinuxEnvironmentAspect;
+
 namespace Internal { class RemoteLinuxEnvironmentReader; }
 
 class RemoteLinuxEnvironmentAspectWidget : public ProjectExplorer::EnvironmentAspectWidget
diff --git a/src/plugins/remotelinux/remotelinuxrunconfiguration.h b/src/plugins/remotelinux/remotelinuxrunconfiguration.h
index 59951dbe45..eceeb5b626 100644
--- a/src/plugins/remotelinux/remotelinuxrunconfiguration.h
+++ b/src/plugins/remotelinux/remotelinuxrunconfiguration.h
@@ -25,8 +25,6 @@
 
 #pragma once
 
-#include "remotelinux_export.h"
-
 #include <projectexplorer/runconfiguration.h>
 
 namespace RemoteLinux {
diff --git a/src/plugins/remotelinux/rsyncdeploystep.h b/src/plugins/remotelinux/rsyncdeploystep.h
index 2a85a216a5..76373a2ef8 100644
--- a/src/plugins/remotelinux/rsyncdeploystep.h
+++ b/src/plugins/remotelinux/rsyncdeploystep.h
@@ -25,9 +25,10 @@
 
 #pragma once
 
-#include "abstractremotelinuxdeploystep.h"
 #include "remotelinux_export.h"
 
+#include "abstractremotelinuxdeploystep.h"
+
 namespace RemoteLinux {
 
 class REMOTELINUX_EXPORT RsyncDeployStep : public AbstractRemoteLinuxDeployStep
diff --git a/src/plugins/remotelinux/sshkeycreationdialog.h b/src/plugins/remotelinux/sshkeycreationdialog.h
index a7efd3c661..859ac326a6 100644
--- a/src/plugins/remotelinux/sshkeycreationdialog.h
+++ b/src/plugins/remotelinux/sshkeycreationdialog.h
@@ -25,12 +25,10 @@
 
 #pragma once
 
-#include "remotelinux_export.h"
-
-#include <utils/filepath.h>
-
 #include <QDialog>
 
+namespace Utils { class FilePath; }
+
 namespace RemoteLinux {
 
 namespace Ui { class SshKeyCreationDialog; }
diff --git a/src/plugins/remotelinux/tarpackagecreationstep.h b/src/plugins/remotelinux/tarpackagecreationstep.h
index 33a7b4358e..3c60815e5f 100644
--- a/src/plugins/remotelinux/tarpackagecreationstep.h
+++ b/src/plugins/remotelinux/tarpackagecreationstep.h
@@ -25,14 +25,13 @@
 
 #pragma once
 
+#include "remotelinux_export.h"
+
 #include "abstractpackagingstep.h"
 #include "deploymenttimeinfo.h"
-#include "remotelinux_export.h"
 
 #include <projectexplorer/deployablefile.h>
 
-#include <utils/aspects.h>
-
 QT_BEGIN_NAMESPACE
 class QFile;
 class QFileInfo;
diff --git a/src/plugins/remotelinux/tarpackagedeploystep.cpp b/src/plugins/remotelinux/tarpackagedeploystep.cpp
index 7247d165c4..db8fdec076 100644
--- a/src/plugins/remotelinux/tarpackagedeploystep.cpp
+++ b/src/plugins/remotelinux/tarpackagedeploystep.cpp
@@ -25,6 +25,7 @@
 
 #include "tarpackagedeploystep.h"
 
+#include "abstractremotelinuxdeployservice.h"
 #include "remotelinux_constants.h"
 #include "tarpackagecreationstep.h"