From ef2ddeb00bf1fb1ff392ad82c8d45ec94b133b38 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Mon, 23 May 2022 22:27:01 +0200
Subject: [PATCH] Utils: More forward declarations / drop unused headers [A-C]

Round 1 - focus on headers.
For classes with initial in range [A-C].
Try to keep the same separators between different kind of headers.

Change-Id: Ieab893d644af035c42590401c90728719394221f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
---
 src/libs/utils/appmainwindow.h                        | 1 +
 src/libs/utils/archive.h                              | 2 +-
 src/libs/utils/aspects.h                              | 2 +-
 src/libs/utils/buildablehelperlibrary.cpp             | 1 +
 src/libs/utils/buildablehelperlibrary.h               | 7 ++++++-
 src/libs/utils/commandline.h                          | 2 +-
 src/libs/utils/completinglineedit.h                   | 1 +
 src/plugins/mcusupport/mcusupportversiondetection.cpp | 2 +-
 src/plugins/python/pyside.h                           | 1 +
 src/plugins/remotelinux/publickeydeploymentdialog.cpp | 1 +
 10 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/libs/utils/appmainwindow.h b/src/libs/utils/appmainwindow.h
index 916772a5d12..6626b904a97 100644
--- a/src/libs/utils/appmainwindow.h
+++ b/src/libs/utils/appmainwindow.h
@@ -26,6 +26,7 @@
 #pragma once
 
 #include "utils_global.h"
+
 #include <QMainWindow>
 
 namespace Utils {
diff --git a/src/libs/utils/archive.h b/src/libs/utils/archive.h
index a392cf04e3e..ebc109dd801 100644
--- a/src/libs/utils/archive.h
+++ b/src/libs/utils/archive.h
@@ -28,12 +28,12 @@
 #include "utils_global.h"
 
 #include "commandline.h"
-#include "fileutils.h"
 
 #include <QObject>
 
 namespace Utils {
 
+class FilePath;
 class QtcProcess;
 
 class QTCREATOR_UTILS_EXPORT Archive : public QObject
diff --git a/src/libs/utils/aspects.h b/src/libs/utils/aspects.h
index 277757aca5e..45b704b237a 100644
--- a/src/libs/utils/aspects.h
+++ b/src/libs/utils/aspects.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "fileutils.h"
+#include "filepath.h"
 #include "id.h"
 #include "infolabel.h"
 #include "macroexpander.h"
diff --git a/src/libs/utils/buildablehelperlibrary.cpp b/src/libs/utils/buildablehelperlibrary.cpp
index 6274ce84da6..c1030fd5e78 100644
--- a/src/libs/utils/buildablehelperlibrary.cpp
+++ b/src/libs/utils/buildablehelperlibrary.cpp
@@ -24,6 +24,7 @@
 ****************************************************************************/
 
 #include "buildablehelperlibrary.h"
+#include "environment.h"
 #include "hostosinfo.h"
 #include "qtcprocess.h"
 
diff --git a/src/libs/utils/buildablehelperlibrary.h b/src/libs/utils/buildablehelperlibrary.h
index 432ed27de36..8b47bef1012 100644
--- a/src/libs/utils/buildablehelperlibrary.h
+++ b/src/libs/utils/buildablehelperlibrary.h
@@ -25,11 +25,16 @@
 
 #pragma once
 
-#include "environment.h"
+#include "utils_global.h"
+
 #include "filepath.h"
 
+#include <QCoreApplication>
+
 namespace Utils {
 
+class Environment;
+
 class QTCREATOR_UTILS_EXPORT BuildableHelperLibrary
 {
     Q_DECLARE_TR_FUNCTIONS(ProjectExplorer::DebuggingHelperLibrary)
diff --git a/src/libs/utils/commandline.h b/src/libs/utils/commandline.h
index 068e724dfd4..8de1f42762e 100644
--- a/src/libs/utils/commandline.h
+++ b/src/libs/utils/commandline.h
@@ -27,7 +27,7 @@
 
 #include "utils_global.h"
 
-#include "fileutils.h"
+#include "filepath.h"
 #include "hostosinfo.h"
 
 #include <QStringList>
diff --git a/src/libs/utils/completinglineedit.h b/src/libs/utils/completinglineedit.h
index 988e0324c4f..e56ae4e3f2b 100644
--- a/src/libs/utils/completinglineedit.h
+++ b/src/libs/utils/completinglineedit.h
@@ -26,6 +26,7 @@
 #pragma once
 
 #include "utils_global.h"
+
 #include <QLineEdit>
 
 namespace Utils {
diff --git a/src/plugins/mcusupport/mcusupportversiondetection.cpp b/src/plugins/mcusupport/mcusupportversiondetection.cpp
index d3bfe33fb32..c7ae1518230 100644
--- a/src/plugins/mcusupport/mcusupportversiondetection.cpp
+++ b/src/plugins/mcusupport/mcusupportversiondetection.cpp
@@ -25,11 +25,11 @@
 
 #include "mcusupportversiondetection.h"
 
-#include <utils/filepath.h>
 #include <utils/qtcprocess.h>
 
 #include <QDir>
 #include <QRegularExpression>
+#include <QXmlStreamReader>
 
 namespace McuSupport {
 namespace Internal {
diff --git a/src/plugins/python/pyside.h b/src/plugins/python/pyside.h
index 5df33f31bb1..f749399903f 100644
--- a/src/plugins/python/pyside.h
+++ b/src/plugins/python/pyside.h
@@ -29,6 +29,7 @@
 
 #include <utils/filepath.h>
 
+#include <QCoreApplication>
 #include <QTextDocument>
 
 namespace TextEditor { class TextDocument; }
diff --git a/src/plugins/remotelinux/publickeydeploymentdialog.cpp b/src/plugins/remotelinux/publickeydeploymentdialog.cpp
index d54423f5e5e..14d856a37ef 100644
--- a/src/plugins/remotelinux/publickeydeploymentdialog.cpp
+++ b/src/plugins/remotelinux/publickeydeploymentdialog.cpp
@@ -27,6 +27,7 @@
 
 #include <projectexplorer/devicesupport/idevice.h>
 #include <projectexplorer/devicesupport/sshparameters.h>
+#include <utils/fileutils.h>
 #include <utils/qtcprocess.h>
 #include <utils/theme/theme.h>