diff options
author | Robert Loehning <robert.loehning@qt.io> | 2020-07-22 22:18:04 +0200 |
---|---|---|
committer | Robert Loehning <robert.loehning@qt.io> | 2020-07-23 15:47:39 +0000 |
commit | 5c0b3196efaf532c874a41458bd07a0fb21ede70 (patch) | |
tree | 4c114af8e6d74ec9db759957e83a247fd1132707 | |
parent | 1203be0bc317b0cf61c42bc2ff4fded18f33702e (diff) |
ProjectExplorer: Fix iterating through files to remove
Change-Id: I680f8e40248dbbf4f4ee76765fad7a99944b0a5f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r-- | src/plugins/projectexplorer/projectexplorer.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index 87faf89807..44222db60d 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -3654,21 +3654,22 @@ void ProjectExplorerPluginPrivate::removeFile() FolderNode *folderNode = file.first->asFileNode()->parentFolderNode(); QTC_ASSERT(folderNode, return); + const Utils::FilePath ¤tFilePath = 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); } } |