aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/scxmleditor
diff options
context:
space:
mode:
authorDavid Schulz <david.schulz@qt.io>2023-08-24 12:48:37 +0200
committerDavid Schulz <david.schulz@qt.io>2023-08-28 13:01:40 +0000
commit4526e1908c0951f01e502392f5c3efc176b7f562 (patch)
tree1aa01c7cb5fd6735401c8e2b86fcf6fdd846f8b8 /src/plugins/scxmleditor
parent541719d443a9bb6f9dfc6a1d3f8dc8f753952a86 (diff)
Editor: remove duplicated path is empty checks when saving
Change-Id: I1fdaacd44918a63e55bce9f15f3f80782ddcbe55 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/plugins/scxmleditor')
-rw-r--r--src/plugins/scxmleditor/scxmleditordocument.cpp12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/plugins/scxmleditor/scxmleditordocument.cpp b/src/plugins/scxmleditor/scxmleditordocument.cpp
index 1459848800..64907f8489 100644
--- a/src/plugins/scxmleditor/scxmleditordocument.cpp
+++ b/src/plugins/scxmleditor/scxmleditordocument.cpp
@@ -60,26 +60,24 @@ Core::IDocument::OpenResult ScxmlEditorDocument::open(QString *errorString,
bool ScxmlEditorDocument::saveImpl(QString *errorString, const FilePath &filePath, bool autoSave)
{
- const FilePath oldFileName = this->filePath();
- const FilePath actualName = filePath.isEmpty() ? oldFileName : filePath;
- if (actualName.isEmpty())
+ if (filePath.isEmpty())
return false;
bool dirty = m_designWidget->isDirty();
- m_designWidget->setFileName(actualName.toString());
+ m_designWidget->setFileName(filePath.toString());
if (!m_designWidget->save()) {
*errorString = m_designWidget->errorMessage();
- m_designWidget->setFileName(oldFileName.toString());
+ m_designWidget->setFileName(this->filePath().toString());
return false;
}
if (autoSave) {
- m_designWidget->setFileName(oldFileName.toString());
+ m_designWidget->setFileName(this->filePath().toString());
m_designWidget->save();
return true;
}
- setFilePath(actualName);
+ setFilePath(filePath);
if (dirty != m_designWidget->isDirty())
emit changed();