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

Editor: remove duplicated path is empty checks when saving

Browse Source 
Change-Id: I1fdaacd44918a63e55bce9f15f3f80782ddcbe55
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
David Schulz
2023-08-24 12:48:37 +02:00
parent 541719d443
commit 4526e1908c
11 changed files with 32 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/texteditor/textdocument.cpp
View File

@@ -662,8 +662,6 @@ bool TextDocument::saveImpl(QString *errorString, const FilePath &filePath, bool
cursor.endEditBlock();
}
const Utils::FilePath &savePath = filePath.isEmpty() ? this->filePath() : filePath;
// check if UTF8-BOM has to be added or removed
Utils::TextFileFormat saveFormat = format();
if (saveFormat.codec->name() == "UTF-8" && supportsUtf8Bom()) {
@@ -679,7 +677,7 @@ bool TextDocument::saveImpl(QString *errorString, const FilePath &filePath, bool
}
}
const bool ok = write(savePath, saveFormat, plainText(), errorString);
const bool ok = write(filePath, saveFormat, plainText(), errorString);
// restore text cursor and scroll bar positions
if (autoSave && undos < d->m_document.availableUndoSteps()) {
@@ -702,7 +700,7 @@ bool TextDocument::saveImpl(QString *errorString, const FilePath &filePath, bool
// inform about the new filename
d->m_document.setModified(false); // also triggers update of the block revisions
setFilePath(savePath.absoluteFilePath());
setFilePath(filePath.absoluteFilePath());
emit changed();
return true;
}