Utils: More forward declarations / drop unused headers [D-G]

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

Change-Id: Id42cd7b3743a816f75cecb6b576c0e37cb057473
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>

src/libs/advanceddockingsystem/ads_globals.cpp

@@ -39,6 +39,8 @@
 #include "docksplitter.h"
 #include "iconprovider.h"
 
+#include <utils/hostosinfo.h>
+
 #include <QAbstractButton>
 #include <QPainter>
 #include <QStyle>

src/libs/advanceddockingsystem/floatingdockcontainer.cpp

@@ -41,6 +41,9 @@
 #include "dockoverlay.h"
 #include "dockwidget.h"
 #include "linux/floatingwidgettitlebar.h"
+
+#include <utils/hostosinfo.h>
+
 #ifdef Q_OS_WIN
 #include <windows.h>
 #ifdef _MSC_VER

src/libs/advanceddockingsystem/floatingdragpreview.cpp

@@ -41,6 +41,8 @@
 #include "dockoverlay.h"
 #include "dockwidget.h"
 
+#include <utils/hostosinfo.h>
+
 #include <QApplication>
 #include <QEvent>
 #include <QKeyEvent>

src/libs/utils/delegates.h

@@ -26,6 +26,7 @@
 #pragma once
 
 #include "utils_global.h"
+
 #include "pathchooser.h"
 
 #include <QStyledItemDelegate>

src/libs/utils/differ.h

@@ -26,6 +26,7 @@
 #pragma once
 
 #include "utils_global.h"
+
 #include <QString>
 
 QT_BEGIN_NAMESPACE

src/libs/utils/dropsupport.cpp

@@ -39,7 +39,7 @@
 
 namespace Utils {
 
-static bool isFileDrop(const QMimeData *d, QList<DropSupport::FileSpec> *files = nullptr)
+static bool isFileDropMime(const QMimeData *d, QList<DropSupport::FileSpec> *files = nullptr)
 {
     // internal drop
     if (const auto internalData = qobject_cast<const DropMimeData *>(d)) {
@@ -94,7 +94,7 @@ QStringList DropSupport::mimeTypesForFilePaths()
 
 bool DropSupport::isFileDrop(QDropEvent *event)
 {
-    return Utils::isFileDrop(event->mimeData());
+    return isFileDropMime(event->mimeData());
 }
 
 bool DropSupport::isValueDrop(QDropEvent *event)
@@ -125,7 +125,7 @@ bool DropSupport::eventFilter(QObject *obj, QEvent *event)
         if (!m_filterFunction || m_filterFunction(de, this)) {
             const auto fileDropMimeData = qobject_cast<const DropMimeData *>(de->mimeData());
             QList<FileSpec> tempFiles;
-            if (Utils::isFileDrop(de->mimeData(), &tempFiles)) {
+            if (isFileDropMime(de->mimeData(), &tempFiles)) {
                 event->accept();
                 accepted = true;
                 if (fileDropMimeData && fileDropMimeData->isOverridingFileDropAction())

src/libs/utils/dropsupport.h

@@ -60,7 +60,7 @@ public:
     static QStringList mimeTypesForFilePaths();
 
 signals:
-    void filesDropped(const QList<Utils::DropSupport::FileSpec> &files, const QPoint &dropPos);
+    void filesDropped(const QList<DropSupport::FileSpec> &files, const QPoint &dropPos);
     void valuesDropped(const QList<QVariant> &values, const QPoint &dropPos);
 
 public:

src/libs/utils/elidinglabel.h

@@ -26,6 +26,7 @@
 #pragma once
 
 #include "utils_global.h"
+
 #include <QLabel>
 
 namespace Utils {

src/libs/utils/environment.cpp

@@ -26,6 +26,7 @@
 #include "environment.h"
 
 #include "algorithm.h"
+#include "fileutils.h"
 #include "qtcassert.h"
 
 #include <QDebug>
@@ -34,12 +35,12 @@
 #include <QSet>
 #include <QCoreApplication>
 
-Q_GLOBAL_STATIC_WITH_ARGS(Utils::Environment, staticSystemEnvironment,
+namespace Utils {
+
+Q_GLOBAL_STATIC_WITH_ARGS(Environment, staticSystemEnvironment,
                           (QProcessEnvironment::systemEnvironment().toStringList()))
 
-Q_GLOBAL_STATIC(QVector<Utils::EnvironmentProvider>, environmentProviders)
+Q_GLOBAL_STATIC(QVector<EnvironmentProvider>, environmentProviders)
-
-namespace Utils {
 
 QProcessEnvironment Environment::toProcessEnvironment() const
 {
@@ -126,7 +127,7 @@ void Environment::prependOrSetLibrarySearchPath(const FilePath &value)
 
 void Environment::prependOrSetLibrarySearchPaths(const FilePaths &values)
 {
-    Utils::reverseForeach(values, [this](const FilePath &value) {
+    reverseForeach(values, [this](const FilePath &value) {
         prependOrSetLibrarySearchPath(value);
     });
 }
@@ -406,7 +407,7 @@ FilePath Environment::expandVariables(const FilePath &variables) const
 
 QStringList Environment::expandVariables(const QStringList &variables) const
 {
-    return Utils::transform(variables, [this](const QString &i) { return expandVariables(i); });
+    return transform(variables, [this](const QString &i) { return expandVariables(i); });
 }
 
 void EnvironmentProvider::addProvider(EnvironmentProvider &&provider)

src/libs/utils/environment.h

@@ -25,13 +25,12 @@
 
 #pragma once
 
-#include "fileutils.h"
+#include "utils_global.h"
-#include "hostosinfo.h"
-#include "namevaluedictionary.h"
-#include "namevalueitem.h"
-#include "optional.h"
 
-#include <QStringList>
+#include "environmentfwd.h"
+#include "filepath.h"
+#include "namevaluedictionary.h"
+#include "optional.h"
 
 #include <functional>
 
@@ -51,11 +50,11 @@ public:
     void appendOrSet(const QString &key, const QString &value, const QString &sep = QString());
     void prependOrSet(const QString &key, const QString &value, const QString &sep = QString());
 
-    void appendOrSetPath(const Utils::FilePath &value);
+    void appendOrSetPath(const FilePath &value);
-    void prependOrSetPath(const Utils::FilePath &value);
+    void prependOrSetPath(const FilePath &value);
 
-    void prependOrSetLibrarySearchPath(const Utils::FilePath &value);
+    void prependOrSetLibrarySearchPath(const FilePath &value);
-    void prependOrSetLibrarySearchPaths(const Utils::FilePaths &values);
+    void prependOrSetLibrarySearchPaths(const FilePaths &values);
 
     void setupEnglishOutput();
 
@@ -97,8 +96,8 @@ public:
 
     void addSetValue(const QString &key, const QString &value);
     void addUnsetValue(const QString &key);
-    void addPrependToPath(const Utils::FilePaths &values);
+    void addPrependToPath(const FilePaths &values);
-    void addAppendToPath(const Utils::FilePaths &values);
+    void addAppendToPath(const FilePaths &values);
     void addModify(const NameValueItems &items);
     void addChange(const Item &item) { m_changeItems.append(item); }
 

src/libs/utils/environmentdialog.h

@@ -25,7 +25,9 @@
 
 #pragma once
 
-#include "environment.h"
+#include "utils_global.h"
+
+#include "environmentfwd.h"
 #include "namevaluesdialog.h"
 #include <thread>
 

src/libs/utils/environmentmodel.h

@@ -25,6 +25,8 @@
 
 #pragma once
 
+#include "utils_global.h"
+
 #include "namevaluemodel.h"
 
 namespace Utils {

src/libs/utils/fadingindicator.h

@@ -27,8 +27,10 @@
 
 #include "utils_global.h"
 
-#include <QString>
+QT_BEGIN_NAMESPACE
-#include <QWidget>
+class QString;
+class QWidget;
+QT_END_NAMESPACE
 
 namespace Utils {
 namespace FadingIndicator {

src/libs/utils/fancylineedit.h

@@ -26,6 +26,7 @@
 #pragma once
 
 #include "utils_global.h"
+
 #include "completinglineedit.h"
 
 #include <QAbstractButton>
@@ -140,7 +141,7 @@ protected:
     void keyPressEvent(QKeyEvent *event) override;
 
 signals:
-    void buttonClicked(Utils::FancyLineEdit::Side side);
+    void buttonClicked(FancyLineEdit::Side side);
     void leftButtonClicked();
     void rightButtonClicked();
 

src/libs/utils/fancymainwindow.cpp

@@ -254,7 +254,7 @@ DockWidget::DockWidget(QWidget *inner, FancyMainWindow *parent, bool immutable)
 
     QString title = inner->windowTitle();
     toggleViewAction()->setProperty("original_title", title);
-    title = Utils::stripAccelerator(title);
+    title = stripAccelerator(title);
     setWindowTitle(title);
 
     QStyleOptionDockWidget opt;
@@ -547,7 +547,7 @@ void FancyMainWindow::addDockActionsToMenu(QMenu *menu)
             actions.append(action);
         }
     }
-    Utils::sort(actions, [](const QAction *action1, const QAction *action2) {
+    sort(actions, [](const QAction *action1, const QAction *action2) {
         QTC_ASSERT(action1, return true);
         QTC_ASSERT(action2, return false);
         return stripAccelerator(action1->text()).toLower() < stripAccelerator(action2->text()).toLower();

src/libs/utils/filecrumblabel.cpp

@@ -25,7 +25,8 @@
 
 #include "filecrumblabel.h"
 
-#include <utils/hostosinfo.h>
+#include "filepath.h"
+#include "hostosinfo.h"
 
 #include <QDir>
 #include <QUrl>

src/libs/utils/filecrumblabel.h

@@ -26,12 +26,13 @@
 #pragma once
 
 #include "utils_global.h"
-#include "fileutils.h"
 
 #include <QLabel>
 
 namespace Utils {
 
+class FilePath;
+
 class QTCREATOR_UTILS_EXPORT FileCrumbLabel : public QLabel
 {
     Q_OBJECT

src/libs/utils/fileinprojectfinder.h

@@ -25,8 +25,9 @@
 
 #pragma once
 
-#include <utils/utils_global.h>
+#include "utils_global.h"
-#include <utils/fileutils.h>
+
+#include "filepath.h"
 
 #include <QHash>
 #include <QSharedPointer>

src/libs/utils/filepath.cpp

@@ -1277,24 +1277,24 @@ Environment FilePath::deviceEnvironment() const
 
 QString FilePath::formatFilePaths(const QList<FilePath> &files, const QString &separator)
 {
-    const QStringList nativeFiles = Utils::transform(files, &FilePath::toUserOutput);
+    const QStringList nativeFiles = transform(files, &FilePath::toUserOutput);
     return nativeFiles.join(separator);
 }
 
 void FilePath::removeDuplicates(QList<FilePath> &files)
 {
     // FIXME: Improve.
-    QStringList list = Utils::transform<QStringList>(files, &FilePath::toString);
+    QStringList list = transform<QStringList>(files, &FilePath::toString);
     list.removeDuplicates();
-    files = Utils::transform(list, &FilePath::fromString);
+    files = transform(list, &FilePath::fromString);
 }
 
 void FilePath::sort(QList<FilePath> &files)
 {
     // FIXME: Improve.
-    QStringList list = Utils::transform<QStringList>(files, &FilePath::toString);
+    QStringList list = transform<QStringList>(files, &FilePath::toString);
     list.sort();
-    files = Utils::transform(list, &FilePath::fromString);
+    files = transform(list, &FilePath::fromString);
 }
 
 FilePath FilePath::pathAppended(const QString &path) const
@@ -1332,7 +1332,7 @@ FilePath FilePath::stringAppended(const QString &str) const
 
 QHashValueType FilePath::hash(uint seed) const
 {
-    if (Utils::HostOsInfo::fileNameCaseSensitivity() == Qt::CaseInsensitive)
+    if (HostOsInfo::fileNameCaseSensitivity() == Qt::CaseInsensitive)
         return qHash(m_data.toUpper(), seed);
     return qHash(m_data, seed);
 }

src/libs/utils/filepath.h

@@ -26,9 +26,9 @@
 #pragma once
 
 #include "utils_global.h"
-#include "porting.h"
 
-#include "hostosinfo.h"
+#include "osspecificaspects.h"
+#include "porting.h"
 
 #include <QDir>
 #include <QDirIterator>

src/libs/utils/filesearch.h

@@ -28,14 +28,18 @@
 #include "utils_global.h"
 
 #include <QDir>
-#include <QFuture>
 #include <QMap>
+#include <QSet>
 #include <QStack>
 #include <QTextDocument>
 
 #include <functional>
 
-QT_FORWARD_DECLARE_CLASS(QTextCodec)
+QT_BEGIN_NAMESPACE
+template <typename T>
+class QFuture;
+class QTextCodec;
+QT_END_NAMESPACE
 
 namespace Utils {
 

src/libs/utils/filesystemmodel.h

@@ -42,7 +42,6 @@
 #include "utils_global.h"
 
 #include <QAbstractItemModel>
-#include <QPair>
 #include <QDir>
 
 QT_BEGIN_NAMESPACE

src/libs/utils/fileutils.cpp

@@ -33,6 +33,8 @@
 #include <QDebug>
 #include <QOperatingSystemVersion>
 #include <QTextStream>
+#include <QXmlStreamWriter>
+
 #include <qplatformdefs.h>
 
 #ifdef QT_GUI_LIB

src/libs/utils/fileutils.h

@@ -31,11 +31,6 @@
 
 #include <QCoreApplication>
 #include <QDir>
-#include <QFileInfo>
-#include <QMetaType>
-#include <QStringList>
-#include <QUrl>
-#include <QXmlStreamWriter> // Mac.
 
 #ifdef QT_WIDGETS_LIB
 #include <QFileDialog>
@@ -48,6 +43,7 @@ QT_BEGIN_NAMESPACE
 class QDataStream;
 class QTextStream;
 class QWidget;
+class QXmlStreamWriter;
 
 // for withNtfsPermissions
 #ifdef Q_OS_WIN

src/libs/utils/filewizardpage.h

@@ -27,11 +27,12 @@
 
 #include "utils_global.h"
 
-#include "filepath.h"
 #include "wizardpage.h"
 
 namespace Utils {
 
+class FilePath;
+
 class FileWizardPagePrivate;
 
 class QTCREATOR_UTILS_EXPORT FileWizardPage : public WizardPage

src/libs/utils/fixedsizeclicklabel.h

@@ -26,6 +26,7 @@
 #pragma once
 
 #include "utils_global.h"
+
 #include <QLabel>
 
 namespace Utils {

src/libs/utils/futuresynchronizer.h

@@ -26,10 +26,10 @@
 #pragma once
 
 #include "utils_global.h"
-#include <QtGlobal>
 
 #include <QFuture>
 #include <QList>
+#include <QtGlobal>
 
 namespace Utils {
 

src/libs/utils/guard.h

@@ -26,6 +26,7 @@
 #pragma once
 
 #include "utils_global.h"
+
 #include <QtGlobal>
 
 namespace Utils {

src/libs/utils/namevaluedictionary.cpp

@@ -25,6 +25,7 @@
 
 #include "algorithm.h"
 #include "namevaluedictionary.h"
+#include "namevalueitem.h"
 #include "qtcassert.h"
 
 namespace Utils {

src/libs/utils/namevaluedictionary.h

@@ -25,7 +25,6 @@
 
 #pragma once
 
-#include "fileutils.h"
 #include "hostosinfo.h"
 #include "namevalueitem.h"
 

src/libs/utils/namevaluemodel.cpp

@@ -25,11 +25,13 @@
 
 #include "namevaluemodel.h"
 
-#include <utils/algorithm.h>
+#include "algorithm.h"
-#include <utils/hostosinfo.h>
+#include "hostosinfo.h"
-#include <utils/namevaluedictionary.h>
+#include "namevaluedictionary.h"
-#include <utils/qtcassert.h>
+#include "namevalueitem.h"
+#include "qtcassert.h"
 
+#include <QFileInfo>
 #include <QFont>
 #include <QGuiApplication>
 #include <QPalette>

src/plugins/android/androidmanifesteditorwidget.cpp

@@ -76,6 +76,8 @@
 #include <QSpinBox>
 #include <QTimer>
 #include <QToolButton>
+#include <QXmlStreamReader>
+#include <QXmlStreamWriter>
 
 #include <algorithm>
 #include <limits>

src/plugins/android/javalanguageserver.cpp

@@ -44,6 +44,7 @@
 
 #include <QGridLayout>
 #include <QLineEdit>
+#include <QXmlStreamWriter>
 
 using namespace ProjectExplorer;
 using namespace Utils;

src/plugins/android/splashscreencontainerwidget.cpp

@@ -43,6 +43,8 @@
 #include <QTabWidget>
 #include <QToolButton>
 #include <QVBoxLayout>
+#include <QXmlStreamReader>
+#include <QXmlStreamWriter>
 
 using namespace Utils;
 

src/plugins/autotest/qtest/qttestsettings.cpp

@@ -28,6 +28,7 @@
 #include "../autotestconstants.h"
 #include "qttestconstants.h"
 
+#include <utils/hostosinfo.h>
 #include <utils/layoutbuilder.h>
 
 using namespace Utils;

src/plugins/clangcodemodel/clangdast.cpp

@@ -28,6 +28,7 @@
 #include <languageclient/client.h>
 #include <languageserverprotocol/jsonkeys.h>
 #include <languageserverprotocol/lsptypes.h>
+#include <utils/hostosinfo.h>
 #include <utils/filepath.h>
 
 #include <QStringView>

src/plugins/coreplugin/mimetypesettings.cpp

@@ -52,6 +52,8 @@
 #include <QStringList>
 #include <QStyledItemDelegate>
 #include <QSortFilterProxyModel>
+#include <QXmlStreamReader>
+#include <QXmlStreamWriter>
 
 static const char kModifiedMimeTypesFile[] = "mimetypes/modifiedmimetypes.xml";
 

src/plugins/cppeditor/resourcepreviewhoverhandler.cpp

@@ -38,6 +38,7 @@
 
 #include <QPoint>
 #include <QTextBlock>
+#include <QXmlStreamReader>
 
 using namespace Core;
 using namespace TextEditor;

src/plugins/cvs/cvssettings.cpp

@@ -27,6 +27,7 @@
 
 #include <coreplugin/icore.h>
 
+#include <utils/hostosinfo.h>
 #include <utils/layoutbuilder.h>
 #include <utils/pathchooser.h>
 

src/plugins/debugger/debuggeractions.cpp

@@ -38,6 +38,7 @@
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/icore.h>
 
+#include <utils/hostosinfo.h>
 #include <utils/qtcassert.h>
 
 #include <QDebug>

src/plugins/debugger/peripheralregisterhandler.cpp

@@ -37,6 +37,7 @@
 #include <QLineEdit>
 #include <QMenu>
 #include <QPainter>
+#include <QXmlStreamReader>
 
 using namespace Utils;
 

src/plugins/fakevim/fakevimactions.cpp

@@ -31,6 +31,7 @@
 // Qt Creator. The idea is to keep this file here in a "clean" state that
 // allows easy reuse with any QTextEdit or QPlainTextEdit derived class.
 
+#include <utils/hostosinfo.h>
 #include <utils/layoutbuilder.h>
 #include <utils/qtcassert.h>
 

src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp

@@ -40,6 +40,7 @@
 #include <extensionsystem/pluginmanager.h>
 
 #include <utils/algorithm.h>
+#include <utils/hostosinfo.h>
 #include <utils/qtcassert.h>
 #include <utils/stringutils.h>
 #include <utils/wizard.h>

src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp

@@ -27,7 +27,6 @@
 
 #include "qmakeproject.h"
 #include "qmakeprojectmanagerconstants.h"
-#include "qmakebuildconfiguration.h"
 
 #include <android/androidconstants.h>
 #include <coreplugin/documentmanager.h>
@@ -57,6 +56,7 @@
 #include <QLoggingCategory>
 #include <QMessageBox>
 #include <QTextCodec>
+#include <QXmlStreamWriter>
 
 using namespace Core;
 using namespace ProjectExplorer;

src/plugins/qmakeprojectmanager/qmakesettings.cpp

@@ -29,8 +29,11 @@
 
 #include <projectexplorer/projectexplorerconstants.h>
 
+#include <utils/hostosinfo.h>
 #include <utils/layoutbuilder.h>
 
+#include <QXmlStreamWriter>
+
 using namespace Utils;
 
 namespace QmakeProjectManager {

src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp

@@ -46,6 +46,7 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/messagebox.h>
 #include <utils/fileutils.h>
+#include <utils/hostosinfo.h>
 #include <utils/qtcassert.h>
 
 #include <QCoreApplication>

src/plugins/remotelinux/remotelinuxenvironmentreader.h

@@ -29,6 +29,7 @@
 #include <utils/environment.h>
 
 #include <QObject>
+#include <QSharedPointer>
 
 namespace Utils { class QtcProcess; }
 

src/plugins/texteditor/highlightersettingspage.cpp

@@ -29,6 +29,7 @@
 #include "ui_highlightersettingspage.h"
 
 #include <coreplugin/icore.h>
+#include <utils/hostosinfo.h>
 
 #include <QDir>
 #include <QMessageBox>

tests/auto/languageserverprotocol/tst_languageserverprotocol.cpp

@@ -27,6 +27,8 @@
 #include <languageserverprotocol/jsonobject.h>
 #include <languageserverprotocol/jsonrpcmessages.h>
 
+#include <utils/hostosinfo.h>
+
 #include <QTextCodec>
 #include <QtTest>
 

tests/auto/utils/fileutils/tst_fileutils.cpp

@@ -28,6 +28,7 @@
 #include <QRandomGenerator>
 
 #include <utils/fileutils.h>
+#include <utils/hostosinfo.h>
 #include <utils/link.h>
 
 //TESTED_COMPONENT=src/libs/utils

tests/auto/utils/qtcprocess/processtestapp/processtestapp.cpp

@@ -27,6 +27,7 @@
 
 #include <utils/qtcprocess.h>
 
+#include <QCoreApplication>
 #include <QDebug>
 #include <QHash>
 #include <QMutex>