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

Core: filepathify file renaming

Browse Source 
Change-Id: I3d4f39e34e65cde3df7b7c19570e3a54d0625d53
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
David Schulz
2021-06-11 14:34:34 +02:00
parent 55b91a7617
commit f66df921d7
32 changed files with 203 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/coreplugin/documentmanager.cpp
View File

@@ -476,15 +476,15 @@ static void dump()
permission information to avoid annoying the user with \e {the file has
been removed} popups.
*/
void DocumentManager::renamedFile(const QString &from, const QString &to)
void DocumentManager::renamedFile(const Utils::FilePath &from, const Utils::FilePath &to)
{
const QString &fromKey = filePathKey(from, KeepLinks);
const Utils::FilePath &fromKey = filePathKey(from, KeepLinks);
// gather the list of IDocuments
QList<IDocument *> documentsToRename;
for (auto it = d->m_documentsWithWatch.cbegin(), end = d->m_documentsWithWatch.cend();
it != end; ++it) {
if (it.value().contains(fromKey))
if (it.value().contains(fromKey.toString()))
documentsToRename.append(it.key());
}
@@ -492,7 +492,7 @@ void DocumentManager::renamedFile(const QString &from, const QString &to)
foreach (IDocument *document, documentsToRename) {
d->m_blockedIDocument = document;
removeFileInfo(document);
document->setFilePath(FilePath::fromString(to));
document->setFilePath(to);
addFileInfos({document});
d->m_blockedIDocument = nullptr;
}
@@ -505,7 +505,7 @@ void DocumentManager::filePathChanged(const FilePath &oldName, const FilePath &n
QTC_ASSERT(doc, return);
if (doc == d->m_blockedIDocument)
return;
emit m_instance->documentRenamed(doc, oldName.toString(), newName.toString());
emit m_instance->documentRenamed(doc, oldName, newName);
}
void DocumentManager::updateSaveAll()