From c7165f2c3cee2d0f0141ff6ef25483173a099b1f Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 17 Aug 2021 10:13:34 +0200 Subject: [PATCH] Core: Remove FileUtils::removeFile(QString) Only used once, and there's an easily accessible removeFiles(FilePaths) at hand. Change-Id: I939298515f27cd34d08afa327ebe198bc30851a1 Reviewed-by: Eike Ziller --- src/plugins/coreplugin/fileutils.cpp | 5 ----- src/plugins/coreplugin/fileutils.h | 1 - src/plugins/resourceeditor/qrceditor/resourcefile.cpp | 3 ++- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/plugins/coreplugin/fileutils.cpp b/src/plugins/coreplugin/fileutils.cpp index e777623f529..59ee2f42636 100644 --- a/src/plugins/coreplugin/fileutils.cpp +++ b/src/plugins/coreplugin/fileutils.cpp @@ -168,11 +168,6 @@ QString FileUtils::msgTerminalWithAction() "Opens a submenu for choosing an environment, such as \"Run Environment\""); } -void FileUtils::removeFile(const QString &filePath, bool deleteFromFS) -{ - removeFiles({FilePath::fromString(filePath)}, deleteFromFS); -} - void FileUtils::removeFiles(const FilePaths &filePaths, bool deleteFromFS) { // remove from version control diff --git a/src/plugins/coreplugin/fileutils.h b/src/plugins/coreplugin/fileutils.h index ab4c2e9c21b..c1b79115076 100644 --- a/src/plugins/coreplugin/fileutils.h +++ b/src/plugins/coreplugin/fileutils.h @@ -51,7 +51,6 @@ struct CORE_EXPORT FileUtils static QString msgTerminalHereAction(); static QString msgTerminalWithAction(); // File operations aware of version control and file system case-insensitiveness - static void removeFile(const QString &filePath, bool deleteFromFS); static void removeFiles(const Utils::FilePaths &filePaths, bool deleteFromFS); static bool renameFile(const Utils::FilePath &from, const Utils::FilePath &to, HandleIncludeGuards handleGuards = HandleIncludeGuards::No); diff --git a/src/plugins/resourceeditor/qrceditor/resourcefile.cpp b/src/plugins/resourceeditor/qrceditor/resourcefile.cpp index bfc77ad26fe..4399e52f994 100644 --- a/src/plugins/resourceeditor/qrceditor/resourcefile.cpp +++ b/src/plugins/resourceeditor/qrceditor/resourcefile.cpp @@ -1260,7 +1260,8 @@ EntryBackup * RelativeResourceModel::removeEntry(const QModelIndex &index) Utils::RemoveFileDialog removeFileDialog(fileNameBackup, Core::ICore::dialogParent()); if (removeFileDialog.exec() == QDialog::Accepted) { deleteItem(index); - Core::FileUtils::removeFile(fileNameBackup, removeFileDialog.isDeleteFileChecked()); + Core::FileUtils::removeFiles({Utils::FilePath::fromString(fileNameBackup)}, + removeFileDialog.isDeleteFileChecked()); return new FileEntryBackup(*this, prefixIndex.row(), index.row(), fileNameBackup, aliasBackup); } return nullptr;