diff --git a/src/libs/utils/reloadpromptutils.cpp b/src/libs/utils/reloadpromptutils.cpp index af59d17fc61..9e0b59f3783 100644 --- a/src/libs/utils/reloadpromptutils.cpp +++ b/src/libs/utils/reloadpromptutils.cpp @@ -38,7 +38,7 @@ namespace Utils { -QTCREATOR_UTILS_EXPORT ReloadPromptAnswer reloadPrompt(const QString &fileName, +QTCREATOR_UTILS_EXPORT ReloadPromptAnswer reloadPrompt(const FileName &fileName, bool modified, QWidget *parent) { @@ -54,8 +54,8 @@ QTCREATOR_UTILS_EXPORT ReloadPromptAnswer reloadPrompt(const QString &fileName, msg = QCoreApplication::translate("Utils::reloadPrompt", "The file %1 has changed outside Qt Creator. Do you want to reload it?"); } - msg = msg.arg(FileName::fromString(fileName).fileName()); - return reloadPrompt(title, msg, QDir::toNativeSeparators(fileName), parent); + msg = msg.arg(fileName.fileName()); + return reloadPrompt(title, msg, fileName.toUserOutput(), parent); } QTCREATOR_UTILS_EXPORT ReloadPromptAnswer reloadPrompt(const QString &title, diff --git a/src/libs/utils/reloadpromptutils.h b/src/libs/utils/reloadpromptutils.h index 8008f45cca3..0810b76794d 100644 --- a/src/libs/utils/reloadpromptutils.h +++ b/src/libs/utils/reloadpromptutils.h @@ -39,6 +39,7 @@ class QWidget; QT_END_NAMESPACE namespace Utils { +class FileName; enum ReloadPromptAnswer { ReloadCurrent, @@ -48,7 +49,7 @@ enum ReloadPromptAnswer { CloseCurrent }; -QTCREATOR_UTILS_EXPORT ReloadPromptAnswer reloadPrompt(const QString &fileName, +QTCREATOR_UTILS_EXPORT ReloadPromptAnswer reloadPrompt(const FileName &fileName, bool modified, QWidget *parent); QTCREATOR_UTILS_EXPORT ReloadPromptAnswer reloadPrompt(const QString &title, diff --git a/src/plugins/coreplugin/documentmanager.cpp b/src/plugins/coreplugin/documentmanager.cpp index 87641980c8f..51445d176da 100644 --- a/src/plugins/coreplugin/documentmanager.cpp +++ b/src/plugins/coreplugin/documentmanager.cpp @@ -1064,7 +1064,7 @@ void DocumentManager::checkForReload() success = document->reload(&errorString, IDocument::FlagReload, IDocument::TypeContents); } else { // Ask about content change - previousReloadAnswer = Utils::reloadPrompt(document->filePath().toString(), document->isModified(), + previousReloadAnswer = Utils::reloadPrompt(document->filePath(), document->isModified(), ICore::dialogParent()); switch (previousReloadAnswer) { case Utils::ReloadAll: