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

Utils: Use FileName in reloadPrompt

Browse Source 
Change-Id: I170208e1c49bcab9c78b1651669252ed0d162bb3
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2015-01-31 20:59:40 +02:00
committed by Orgad Shaneh
parent d9f31aa635
commit a9014e074d
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libs/utils/reloadpromptutils.cpp
View File

@@ -38,7 +38,7 @@
namespace Utils { namespace Utils {
QTCREATOR_UTILS_EXPORT ReloadPromptAnswer reloadPrompt(const QString &fileName, QTCREATOR_UTILS_EXPORT ReloadPromptAnswer reloadPrompt(const FileName &fileName,
bool modified, bool modified,
QWidget *parent) QWidget *parent)
{ {
@@ -54,8 +54,8 @@ QTCREATOR_UTILS_EXPORT ReloadPromptAnswer reloadPrompt(const QString &fileName,
msg = QCoreApplication::translate("Utils::reloadPrompt", msg = QCoreApplication::translate("Utils::reloadPrompt",
"The file <i>%1</i> has changed outside Qt Creator. Do you want to reload it?"); "The file <i>%1</i> has changed outside Qt Creator. Do you want to reload it?");
} }
msg = msg.arg(FileName::fromString(fileName).fileName()); msg = msg.arg(fileName.fileName());
return reloadPrompt(title, msg, QDir::toNativeSeparators(fileName), parent); return reloadPrompt(title, msg, fileName.toUserOutput(), parent);
} }
QTCREATOR_UTILS_EXPORT ReloadPromptAnswer reloadPrompt(const QString &title, QTCREATOR_UTILS_EXPORT ReloadPromptAnswer reloadPrompt(const QString &title,

3
src/libs/utils/reloadpromptutils.h
View File

@@ -39,6 +39,7 @@ class QWidget;
QT_END_NAMESPACE QT_END_NAMESPACE
namespace Utils { namespace Utils {
class FileName;
enum ReloadPromptAnswer { enum ReloadPromptAnswer {
ReloadCurrent, ReloadCurrent,
@@ -48,7 +49,7 @@ enum ReloadPromptAnswer {
CloseCurrent CloseCurrent
}; };
QTCREATOR_UTILS_EXPORT ReloadPromptAnswer reloadPrompt(const QString &fileName, QTCREATOR_UTILS_EXPORT ReloadPromptAnswer reloadPrompt(const FileName &fileName,
bool modified, bool modified,
QWidget *parent); QWidget *parent);
QTCREATOR_UTILS_EXPORT ReloadPromptAnswer reloadPrompt(const QString &title, QTCREATOR_UTILS_EXPORT ReloadPromptAnswer reloadPrompt(const QString &title,

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

@@ -1064,7 +1064,7 @@ void DocumentManager::checkForReload()
success = document->reload(&errorString, IDocument::FlagReload, IDocument::TypeContents); success = document->reload(&errorString, IDocument::FlagReload, IDocument::TypeContents);
} else { } else {
// Ask about content change // Ask about content change
previousReloadAnswer = Utils::reloadPrompt(document->filePath().toString(), document->isModified(), previousReloadAnswer = Utils::reloadPrompt(document->filePath(), document->isModified(),
ICore::dialogParent()); ICore::dialogParent());
switch (previousReloadAnswer) { switch (previousReloadAnswer) {
case Utils::ReloadAll: case Utils::ReloadAll: