diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2017-07-03 11:26:52 +0200 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2017-07-05 14:20:46 +0000 |
| commit | 13fc3c83138bf7fc898228dd30fd4ae90fd3421d (patch) | |
| tree | 55bc452756abcde719385d5ef40c53f027728be8 /src/plugins/diffeditor/diffeditordocument.cpp | |
| parent | 6509753e8684c17f8e05e5e157cbd1f310086292 (diff) | |
| download | qt-creator-13fc3c83138bf7fc898228dd30fd4ae90fd3421d.tar.gz | |
DiffEditor: Share "failed" state among multiple views
Change-Id: Id049ce8eafcb21d5e60fae17c47df8657c0e5779
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src/plugins/diffeditor/diffeditordocument.cpp')
| -rw-r--r-- | src/plugins/diffeditor/diffeditordocument.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/diffeditor/diffeditordocument.cpp b/src/plugins/diffeditor/diffeditordocument.cpp index aac0ba2f06..12c3362770 100644 --- a/src/plugins/diffeditor/diffeditordocument.cpp +++ b/src/plugins/diffeditor/diffeditordocument.cpp @@ -205,7 +205,7 @@ QString DiffEditorDocument::fallbackSaveAsPath() const bool DiffEditorDocument::isSaveAsAllowed() const { - return !isReloading(); + return state() == LoadOK; } bool DiffEditorDocument::save(QString *errorString, const QString &fileName, bool autoSave) @@ -213,7 +213,7 @@ bool DiffEditorDocument::save(QString *errorString, const QString &fileName, boo Q_UNUSED(errorString) Q_UNUSED(autoSave) - if (isReloading()) + if (state() != LoadOK) return false; const bool ok = write(fileName, format(), plainText(), errorString); @@ -337,7 +337,7 @@ QString DiffEditorDocument::plainText() const void DiffEditorDocument::beginReload() { emit aboutToReload(); - m_isReloading = true; + m_state = Reloading; emit changed(); const bool blocked = blockSignals(true); setDiffFiles(QList<FileData>(), QString()); @@ -347,7 +347,7 @@ void DiffEditorDocument::beginReload() void DiffEditorDocument::endReload(bool success) { - m_isReloading = false; + m_state = success ? LoadOK : LoadFailed; emit changed(); emit reloadFinished(success); } |