feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ProjectExplorer: Fix iterating through files to remove

Browse Source 
Change-Id: I680f8e40248dbbf4f4ee76765fad7a99944b0a5f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Robert Loehning
2020-07-22 22:18:04 +02:00
parent 1203be0bc3
commit 5c0b3196ef
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/projectexplorer/projectexplorer.cpp
View File

@@ -3654,21 +3654,22 @@ void ProjectExplorerPluginPrivate::removeFile()
FolderNode *folderNode = file.first->asFileNode()->parentFolderNode();
QTC_ASSERT(folderNode, return);
const Utils::FilePath &currentFilePath = file.second;
const RemovedFilesFromProject status
= folderNode->removeFiles(QStringList(file.second.toString()));
= folderNode->removeFiles(QStringList(currentFilePath.toString()));
const bool success = status == RemovedFilesFromProject::Ok
|| (status == RemovedFilesFromProject::Wildcard
&& removeFileDialog.isDeleteFileChecked());
if (!success) {
TaskHub::addTask(BuildSystemTask(Task::Error,
tr("Could not remove file \"%1\" from project \"%2\".")
.arg(filePath.toUserOutput(), folderNode->managingProject()->displayName()),
.arg(currentFilePath.toUserOutput(), folderNode->managingProject()->displayName()),
folderNode->managingProject()->filePath()));
if (!deleteFile)
continue;
}
FileChangeBlocker changeGuard(filePath.toString());
Core::FileUtils::removeFile(filePath.toString(), deleteFile);
FileChangeBlocker changeGuard(currentFilePath.toString());
Core::FileUtils::removeFile(currentFilePath.toString(), deleteFile);
}
}