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>
2022-07-28 16:09:45 +02:00
parent 00ef718664
commit 6f42aa5216
27 changed files with 27 additions and 24 deletions
--- 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>
--- 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>
--- 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>

--- 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>
--- 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>

--- 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>
--- 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>
--- 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>
--- 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>
--- 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>

--- 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>
--- 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>
--- 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>
--- 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
--- 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>
--- 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>
--- 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>

--- 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>
--- 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>
--- 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>

--- 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>
--- 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>

--- 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
--- 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>
--- 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>

--- 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>

--- 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>