From 6f42aa5216dede795800ad5ed8a05bcc35b2ed47 Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@qt.io>
Date: Thu, 28 Jul 2022 16:09:45 +0200
Subject: [PATCH] Core: Include more utils/filepaths.h instead of
 utils/fileutils.h

Change-Id: If9d229abf2266a6550ff63534d8cde47e2d68d5c
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
---
 src/plugins/coreplugin/dialogs/codecselector.cpp       | 2 +-
 src/plugins/coreplugin/dialogs/openwithdialog.cpp      | 2 +-
 src/plugins/coreplugin/dialogs/readonlyfilesdialog.h   | 2 +-
 src/plugins/coreplugin/dialogs/saveitemsdialog.cpp     | 2 +-
 src/plugins/coreplugin/editormanager/documentmodel.h   | 2 +-
 src/plugins/coreplugin/editormanager/editorview.h      | 2 +-
 src/plugins/coreplugin/editormanager/systemeditor.cpp  | 2 +-
 src/plugins/coreplugin/editortoolbar.cpp               | 2 +-
 src/plugins/coreplugin/externaltool.h                  | 2 +-
 src/plugins/coreplugin/find/searchresultitem.h         | 2 +-
 src/plugins/coreplugin/foldernavigationwidget.cpp      | 2 +-
 src/plugins/coreplugin/foldernavigationwidget.h        | 2 +-
 src/plugins/coreplugin/idocument.cpp                   | 2 +-
 src/plugins/coreplugin/idocument.h                     | 3 +--
 src/plugins/coreplugin/iwizardfactory.cpp              | 2 +-
 src/plugins/coreplugin/locator/basefilefilter.cpp      | 2 +-
 src/plugins/coreplugin/locator/basefilefilter.h        | 2 +-
 src/plugins/coreplugin/locator/directoryfilter.cpp     | 1 +
 src/plugins/coreplugin/locator/filesystemfilter.cpp    | 2 +-
 src/plugins/coreplugin/locator/ilocatorfilter.h        | 2 +-
 src/plugins/coreplugin/locator/locator_test.cpp        | 2 +-
 src/plugins/coreplugin/locator/opendocumentsfilter.cpp | 2 +-
 src/plugins/coreplugin/locator/urllocatorfilter.h      | 1 +
 src/plugins/coreplugin/vcsmanager.h                    | 2 +-
 src/plugins/modeleditor/modeleditor.cpp                | 1 +
 src/plugins/resourceeditor/resourceeditorw.cpp         | 2 +-
 src/plugins/texteditor/behaviorsettingspage.cpp        | 1 +
 27 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/src/plugins/coreplugin/dialogs/codecselector.cpp b/src/plugins/coreplugin/dialogs/codecselector.cpp
index 864d56d2097..1b5b1cc9002 100644
--- a/src/plugins/coreplugin/dialogs/codecselector.cpp
+++ b/src/plugins/coreplugin/dialogs/codecselector.cpp
@@ -27,7 +27,7 @@
 #include <coreplugin/textdocument.h>
 
 #include <utils/algorithm.h>
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 #include <utils/itemviews.h>
 
 #include <QDebug>
diff --git a/src/plugins/coreplugin/dialogs/openwithdialog.cpp b/src/plugins/coreplugin/dialogs/openwithdialog.cpp
index 5901d2184eb..e5136908a0a 100644
--- a/src/plugins/coreplugin/dialogs/openwithdialog.cpp
+++ b/src/plugins/coreplugin/dialogs/openwithdialog.cpp
@@ -25,7 +25,7 @@
 
 #include "openwithdialog.h"
 
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 #include <utils/layoutbuilder.h>
 
 #include <QDialogButtonBox>
diff --git a/src/plugins/coreplugin/dialogs/readonlyfilesdialog.h b/src/plugins/coreplugin/dialogs/readonlyfilesdialog.h
index b934062e7e0..ad56e8dcb39 100644
--- a/src/plugins/coreplugin/dialogs/readonlyfilesdialog.h
+++ b/src/plugins/coreplugin/dialogs/readonlyfilesdialog.h
@@ -27,7 +27,7 @@
 
 #include <coreplugin/core_global.h>
 
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 
 #include <QDialog>
 
diff --git a/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp b/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp
index ab7dd50aaab..8ae74681379 100644
--- a/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp
+++ b/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp
@@ -28,7 +28,7 @@
 #include <coreplugin/diffservice.h>
 #include <coreplugin/idocument.h>
 
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 #include <utils/fsengine/fileiconprovider.h>
 #include <utils/hostosinfo.h>
 #include <utils/layoutbuilder.h>
diff --git a/src/plugins/coreplugin/editormanager/documentmodel.h b/src/plugins/coreplugin/editormanager/documentmodel.h
index a4f759d4d74..557e65df361 100644
--- a/src/plugins/coreplugin/editormanager/documentmodel.h
+++ b/src/plugins/coreplugin/editormanager/documentmodel.h
@@ -27,7 +27,7 @@
 
 #include "../core_global.h"
 
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 #include <utils/id.h>
 #include <utils/optional.h>
 
diff --git a/src/plugins/coreplugin/editormanager/editorview.h b/src/plugins/coreplugin/editormanager/editorview.h
index 024371674b3..4d5b682370a 100644
--- a/src/plugins/coreplugin/editormanager/editorview.h
+++ b/src/plugins/coreplugin/editormanager/editorview.h
@@ -26,7 +26,7 @@
 #pragma once
 
 #include <utils/dropsupport.h>
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 #include <utils/id.h>
 
 #include <QMap>
diff --git a/src/plugins/coreplugin/editormanager/systemeditor.cpp b/src/plugins/coreplugin/editormanager/systemeditor.cpp
index c2791791ccb..2e825553b29 100644
--- a/src/plugins/coreplugin/editormanager/systemeditor.cpp
+++ b/src/plugins/coreplugin/editormanager/systemeditor.cpp
@@ -25,7 +25,7 @@
 
 #include "systemeditor.h"
 
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 
 #include <QStringList>
 #include <QUrl>
diff --git a/src/plugins/coreplugin/editortoolbar.cpp b/src/plugins/coreplugin/editortoolbar.cpp
index 16f8c21ad4f..5fb5e29ef3a 100644
--- a/src/plugins/coreplugin/editortoolbar.cpp
+++ b/src/plugins/coreplugin/editortoolbar.cpp
@@ -33,7 +33,7 @@
 #include <coreplugin/editormanager/ieditor.h>
 #include <coreplugin/icore.h>
 
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 #include <utils/fsengine/fileiconprovider.h>
 #include <utils/hostosinfo.h>
 #include <utils/qtcassert.h>
diff --git a/src/plugins/coreplugin/externaltool.h b/src/plugins/coreplugin/externaltool.h
index a1e16f10f56..b69ee69581f 100644
--- a/src/plugins/coreplugin/externaltool.h
+++ b/src/plugins/coreplugin/externaltool.h
@@ -28,7 +28,7 @@
 #include <coreplugin/core_global.h>
 
 #include <utils/environment.h>
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 #include <utils/id.h>
 
 #include <QObject>
diff --git a/src/plugins/coreplugin/find/searchresultitem.h b/src/plugins/coreplugin/find/searchresultitem.h
index 04e9bae1b5c..1d20fee7e22 100644
--- a/src/plugins/coreplugin/find/searchresultitem.h
+++ b/src/plugins/coreplugin/find/searchresultitem.h
@@ -27,7 +27,7 @@
 
 #include "searchresultcolor.h"
 
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 #include <utils/hostosinfo.h>
 #include <utils/optional.h>
 
diff --git a/src/plugins/coreplugin/foldernavigationwidget.cpp b/src/plugins/coreplugin/foldernavigationwidget.cpp
index 0ffa8e2e347..0ab80344d52 100644
--- a/src/plugins/coreplugin/foldernavigationwidget.cpp
+++ b/src/plugins/coreplugin/foldernavigationwidget.cpp
@@ -44,7 +44,7 @@
 
 #include <utils/algorithm.h>
 #include <utils/filecrumblabel.h>
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 #include <utils/fsengine/fileiconprovider.h>
 #include <utils/hostosinfo.h>
 #include <utils/navigationtreeview.h>
diff --git a/src/plugins/coreplugin/foldernavigationwidget.h b/src/plugins/coreplugin/foldernavigationwidget.h
index e5b2242c912..2b50c9cf5ec 100644
--- a/src/plugins/coreplugin/foldernavigationwidget.h
+++ b/src/plugins/coreplugin/foldernavigationwidget.h
@@ -28,7 +28,7 @@
 #include "core_global.h"
 #include "inavigationwidgetfactory.h"
 
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 
 #include <QIcon>
 #include <QWidget>
diff --git a/src/plugins/coreplugin/idocument.cpp b/src/plugins/coreplugin/idocument.cpp
index 114f9914d3f..4ed3f28f519 100644
--- a/src/plugins/coreplugin/idocument.cpp
+++ b/src/plugins/coreplugin/idocument.cpp
@@ -25,7 +25,7 @@
 
 #include "idocument.h"
 
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 #include <utils/infobar.h>
 #include <utils/minimizableinfobars.h>
 #include <utils/optional.h>
diff --git a/src/plugins/coreplugin/idocument.h b/src/plugins/coreplugin/idocument.h
index 16d94fa7797..2bcf1cbe69b 100644
--- a/src/plugins/coreplugin/idocument.h
+++ b/src/plugins/coreplugin/idocument.h
@@ -27,13 +27,12 @@
 
 #include "core_global.h"
 
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 #include <utils/id.h>
 
 #include <QObject>
 
 namespace Utils {
-class FilePath;
 class InfoBar;
 class MinimizableInfoBars;
 } // namespace Utils
diff --git a/src/plugins/coreplugin/iwizardfactory.cpp b/src/plugins/coreplugin/iwizardfactory.cpp
index ca83939d1c4..7ae54ab83f7 100644
--- a/src/plugins/coreplugin/iwizardfactory.cpp
+++ b/src/plugins/coreplugin/iwizardfactory.cpp
@@ -33,7 +33,7 @@
 #include <extensionsystem/pluginspec.h>
 #include <extensionsystem/pluginmanager.h>
 
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 #include <utils/icon.h>
 #include <utils/qtcassert.h>
 #include <utils/wizard.h>
diff --git a/src/plugins/coreplugin/locator/basefilefilter.cpp b/src/plugins/coreplugin/locator/basefilefilter.cpp
index 888db29ac58..616648e98aa 100644
--- a/src/plugins/coreplugin/locator/basefilefilter.cpp
+++ b/src/plugins/coreplugin/locator/basefilefilter.cpp
@@ -27,7 +27,7 @@
 
 #include <coreplugin/editormanager/editormanager.h>
 #include <utils/algorithm.h>
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 #include <utils/linecolumn.h>
 #include <utils/link.h>
 #include <utils/qtcassert.h>
diff --git a/src/plugins/coreplugin/locator/basefilefilter.h b/src/plugins/coreplugin/locator/basefilefilter.h
index 0e61d18be46..ff5d1baee46 100644
--- a/src/plugins/coreplugin/locator/basefilefilter.h
+++ b/src/plugins/coreplugin/locator/basefilefilter.h
@@ -27,7 +27,7 @@
 
 #include "ilocatorfilter.h"
 
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 
 #include <QSharedPointer>
 
diff --git a/src/plugins/coreplugin/locator/directoryfilter.cpp b/src/plugins/coreplugin/locator/directoryfilter.cpp
index cb010653afb..a52ded37a54 100644
--- a/src/plugins/coreplugin/locator/directoryfilter.cpp
+++ b/src/plugins/coreplugin/locator/directoryfilter.cpp
@@ -30,6 +30,7 @@
 
 #include <coreplugin/coreconstants.h>
 #include <utils/algorithm.h>
+#include <utils/fileutils.h>
 #include <utils/filesearch.h>
 
 #include <QFileDialog>
diff --git a/src/plugins/coreplugin/locator/filesystemfilter.cpp b/src/plugins/coreplugin/locator/filesystemfilter.cpp
index 08ecb68418a..9216fa40406 100644
--- a/src/plugins/coreplugin/locator/filesystemfilter.cpp
+++ b/src/plugins/coreplugin/locator/filesystemfilter.cpp
@@ -36,7 +36,7 @@
 #include <coreplugin/idocument.h>
 #include <coreplugin/vcsmanager.h>
 #include <utils/checkablemessagebox.h>
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 #include <utils/link.h>
 
 #include <QDir>
diff --git a/src/plugins/coreplugin/locator/ilocatorfilter.h b/src/plugins/coreplugin/locator/ilocatorfilter.h
index dfcbfc4e67f..d57349aa9dc 100644
--- a/src/plugins/coreplugin/locator/ilocatorfilter.h
+++ b/src/plugins/coreplugin/locator/ilocatorfilter.h
@@ -27,7 +27,7 @@
 
 #include <coreplugin/core_global.h>
 
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 #include <utils/id.h>
 #include <utils/optional.h>
 
diff --git a/src/plugins/coreplugin/locator/locator_test.cpp b/src/plugins/coreplugin/locator/locator_test.cpp
index afe04a39aeb..9798242619a 100644
--- a/src/plugins/coreplugin/locator/locator_test.cpp
+++ b/src/plugins/coreplugin/locator/locator_test.cpp
@@ -30,7 +30,7 @@
 
 #include <coreplugin/testdatadir.h>
 #include <utils/algorithm.h>
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 
 #include <QDir>
 #include <QTextStream>
diff --git a/src/plugins/coreplugin/locator/opendocumentsfilter.cpp b/src/plugins/coreplugin/locator/opendocumentsfilter.cpp
index 2570c7ea650..ff61dbce316 100644
--- a/src/plugins/coreplugin/locator/opendocumentsfilter.cpp
+++ b/src/plugins/coreplugin/locator/opendocumentsfilter.cpp
@@ -28,7 +28,7 @@
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/editormanager/ieditor.h>
 #include <coreplugin/locator/basefilefilter.h>
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 #include <utils/link.h>
 #include <utils/linecolumn.h>
 
diff --git a/src/plugins/coreplugin/locator/urllocatorfilter.h b/src/plugins/coreplugin/locator/urllocatorfilter.h
index 5a7bdb01681..d7fef99a2eb 100644
--- a/src/plugins/coreplugin/locator/urllocatorfilter.h
+++ b/src/plugins/coreplugin/locator/urllocatorfilter.h
@@ -29,6 +29,7 @@
 
 #include <coreplugin/core_global.h>
 
+#include <QDialog>
 #include <QMutex>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/coreplugin/vcsmanager.h b/src/plugins/coreplugin/vcsmanager.h
index e9cb02bdd70..6e2ab7fe4a7 100644
--- a/src/plugins/coreplugin/vcsmanager.h
+++ b/src/plugins/coreplugin/vcsmanager.h
@@ -27,7 +27,7 @@
 
 #include "core_global.h"
 
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 #include <utils/id.h>
 
 #include <QString>
diff --git a/src/plugins/modeleditor/modeleditor.cpp b/src/plugins/modeleditor/modeleditor.cpp
index dc14946cb97..b040fd1f622 100644
--- a/src/plugins/modeleditor/modeleditor.cpp
+++ b/src/plugins/modeleditor/modeleditor.cpp
@@ -76,6 +76,7 @@
 #include <coreplugin/minisplitter.h>
 #include <coreplugin/actionmanager/commandbutton.h>
 #include <utils/fadingindicator.h>
+#include <utils/fileutils.h>
 #include <utils/styledbar.h>
 #include <utils/qtcassert.h>
 
diff --git a/src/plugins/resourceeditor/resourceeditorw.cpp b/src/plugins/resourceeditor/resourceeditorw.cpp
index 232117824a4..a6a2bedadf8 100644
--- a/src/plugins/resourceeditor/resourceeditorw.cpp
+++ b/src/plugins/resourceeditor/resourceeditorw.cpp
@@ -36,7 +36,7 @@
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/icore.h>
 
-#include <utils/filepath.h>
+#include <utils/fileutils.h>
 #include <utils/reloadpromptutils.h>
 #include <utils/stringutils.h>
 
diff --git a/src/plugins/texteditor/behaviorsettingspage.cpp b/src/plugins/texteditor/behaviorsettingspage.cpp
index d38c2926d36..a5232b83cc9 100644
--- a/src/plugins/texteditor/behaviorsettingspage.cpp
+++ b/src/plugins/texteditor/behaviorsettingspage.cpp
@@ -48,6 +48,7 @@
 #include <qmljseditor/qmljseditorconstants.h>
 #include <qmljstools/qmljstoolsconstants.h>
 
+#include <QCoreApplication>
 #include <QGridLayout>
 #include <QPointer>
 #include <QSettings>