From 990ce2052302ed0f1366850b4542a2cf0b3325f4 Mon Sep 17 00:00:00 2001 From: Hugo Holgersson Date: Thu, 2 Nov 2017 18:30:18 +0100 Subject: [PATCH] EditorManager: Sprinkle const over the window title logic This amends 2ab5561b9aac005bc9985ffeffb7e621a55b3bdd. Change-Id: Ic7c36348e88b72d6c1fed75ca149958be332345e Reviewed-by: Orgad Shaneh --- src/plugins/coreplugin/editormanager/editormanager.cpp | 2 +- src/plugins/projectexplorer/session.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp index 261e3560d69..15912ab85ce 100644 --- a/src/plugins/coreplugin/editormanager/editormanager.cpp +++ b/src/plugins/coreplugin/editormanager/editormanager.cpp @@ -1766,7 +1766,7 @@ void EditorManagerPrivate::updateWindowTitleForDocument(IDocument *document, QWi if (!documentName.isEmpty()) windowTitle.append(documentName); - QString filePath = document ? document->filePath().toFileInfo().absoluteFilePath() + const QString filePath = document ? document->filePath().toFileInfo().absoluteFilePath() : QString(); const QString windowTitleAddition = d->m_titleAdditionHandler ? d->m_titleAdditionHandler(filePath) diff --git a/src/plugins/projectexplorer/session.cpp b/src/plugins/projectexplorer/session.cpp index 0602f44e1db..add794c31f3 100644 --- a/src/plugins/projectexplorer/session.cpp +++ b/src/plugins/projectexplorer/session.cpp @@ -558,17 +558,17 @@ QString SessionManagerPrivate::sessionTitle(const QString &filePath) } QString SessionManagerPrivate::locationInProject(const QString &filePath) { - Project *project = SessionManager::projectForFile(Utils::FileName::fromString(filePath)); + const Project *project = SessionManager::projectForFile(Utils::FileName::fromString(filePath)); if (!project) return QString(); - Utils::FileName file = Utils::FileName::fromString(filePath); - Utils::FileName parentDir = file.parentDir(); + const Utils::FileName file = Utils::FileName::fromString(filePath); + const Utils::FileName parentDir = file.parentDir(); if (parentDir == project->projectDirectory()) return "@ " + project->displayName(); if (file.isChildOf(project->projectDirectory())) { - Utils::FileName dirInProject = parentDir.relativeChildPath(project->projectDirectory()); + const Utils::FileName dirInProject = parentDir.relativeChildPath(project->projectDirectory()); return "(" + dirInProject.toUserOutput() + " @ " + project->displayName() + ")"; }