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

EditorManager: Remove unnecessary use of defaultPath() in saveDocumentAs

Browse Source 
Do not unnecessarily construct a path with document->defaultPath(). We
can just ask for the mime type(s) for the suggestedFileName without a
path.

Change-Id: I1354756bd7760561a2bd9d39f491c5e1b6aeb3ab
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
This commit is contained in:
Eike Ziller
2016-01-14 12:49:38 +01:00
parent 27425b62e9
commit 66088a799a
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/coreplugin/editormanager/editormanager.cpp
View File

@@ -1926,11 +1926,17 @@ bool EditorManagerPrivate::saveDocumentAs(IDocument *document)
Utils::MimeDatabase mdb; Utils::MimeDatabase mdb;
const QString filter = Utils::MimeDatabase::allFiltersString(); const QString filter = Utils::MimeDatabase::allFiltersString();
QString selectedFilter; QString selectedFilter;
QString filePath = document->filePath().toString(); const QString filePath = document->filePath().toString();
if (filePath.isEmpty()) if (!filePath.isEmpty()) {
filePath = document->defaultPath() + QLatin1Char('/') + document->suggestedFileName();
if (!filePath.isEmpty())
selectedFilter = mdb.mimeTypeForFile(filePath).filterString(); selectedFilter = mdb.mimeTypeForFile(filePath).filterString();
} else {
const QString suggestedName = document->suggestedFileName();
if (!suggestedName.isEmpty()) {
const QList<MimeType> types = mdb.mimeTypesForFileName(suggestedName);
if (!types.isEmpty())
selectedFilter = types.first().filterString();
}
}
if (selectedFilter.isEmpty()) if (selectedFilter.isEmpty())
selectedFilter = mdb.mimeTypeForName(document->mimeType()).filterString(); selectedFilter = mdb.mimeTypeForName(document->mimeType()).filterString();
const QString &absoluteFilePath = const QString &absoluteFilePath =