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

ProjectExplorer: Do not list files more than once in the rename dialog

Browse Source 
... for project tree entries. The same file can occur more than once in
the tree.

Task-number: QTCREATORBUG-26268
Change-Id: I8af1e3a73d54e5a54c858fb3f7a8cf4afa83c7e2
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Kandeler
2021-09-16 16:05:30 +02:00
parent fc35635942
commit b74b5a3ee6
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/projectexplorer/projectmodels.cpp
View File

@@ -308,12 +308,14 @@ bool FlatModel::setData(const QModelIndex &index, const QVariant &value, int rol
if (orgFilePath != newFilePath && orgFilePath.suffix() == newFilePath.suffix()) { if (orgFilePath != newFilePath && orgFilePath.suffix() == newFilePath.suffix()) {
const QList<Node *> candidateNodes = ProjectTree::siblingsWithSameBaseName(node); const QList<Node *> candidateNodes = ProjectTree::siblingsWithSameBaseName(node);
if (!candidateNodes.isEmpty()) { if (!candidateNodes.isEmpty()) {
QStringList fileNames = transform<QStringList>(candidateNodes, [](const Node *n) {
return n->filePath().fileName();
});
fileNames.removeDuplicates();
const QMessageBox::StandardButton reply = QMessageBox::question( const QMessageBox::StandardButton reply = QMessageBox::question(
Core::ICore::dialogParent(), tr("Rename More Files?"), Core::ICore::dialogParent(), tr("Rename More Files?"),
tr("Would you like to rename these files as well?\n %1") tr("Would you like to rename these files as well?\n %1")
.arg(transform<QStringList>(candidateNodes, [](const Node *n) { .arg(fileNames.join("\n ")));
return n->filePath().fileName();
}).join("\n ")));
if (reply == QMessageBox::Yes) { if (reply == QMessageBox::Yes) {
for (Node * const n : candidateNodes) { for (Node * const n : candidateNodes) {
QString targetFilePath = orgFileInfo.absolutePath() + '/' QString targetFilePath = orgFileInfo.absolutePath() + '/'