From cc502e36671e8d45d470b9aa38877e541c4f8613 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Wed, 23 Sep 2020 16:38:01 +0200 Subject: [PATCH] Remove bool return value from IEditor::restoreState() It's never used, and actually there wouldn't be any sensible thing to do with it. Change-Id: Id8a8df18c7db4b98e5abbc034240bb90dc1dcaa9 Reviewed-by: hjk --- src/plugins/coreplugin/editormanager/ieditor.h | 2 +- src/plugins/modeleditor/modeleditor.cpp | 4 +--- src/plugins/modeleditor/modeleditor.h | 2 +- src/plugins/qmljseditor/qmljseditor.cpp | 4 ++-- src/plugins/qmljseditor/qmljseditor.h | 2 +- src/plugins/resourceeditor/resourceeditorw.cpp | 6 ++---- src/plugins/resourceeditor/resourceeditorw.h | 2 +- src/plugins/texteditor/texteditor.cpp | 11 +++++------ src/plugins/texteditor/texteditor.h | 4 ++-- 9 files changed, 16 insertions(+), 21 deletions(-) diff --git a/src/plugins/coreplugin/editormanager/ieditor.h b/src/plugins/coreplugin/editormanager/ieditor.h index 2b598337bfb..0dac17973fe 100644 --- a/src/plugins/coreplugin/editormanager/ieditor.h +++ b/src/plugins/coreplugin/editormanager/ieditor.h @@ -49,7 +49,7 @@ public: virtual IEditor *duplicate() { return nullptr; } virtual QByteArray saveState() const { return QByteArray(); } - virtual bool restoreState(const QByteArray &/*state*/) { return true; } + virtual void restoreState(const QByteArray & /*state*/) {} virtual int currentLine() const { return 0; } virtual int currentColumn() const { return 0; } diff --git a/src/plugins/modeleditor/modeleditor.cpp b/src/plugins/modeleditor/modeleditor.cpp index 152ead0f215..403ef07959d 100644 --- a/src/plugins/modeleditor/modeleditor.cpp +++ b/src/plugins/modeleditor/modeleditor.cpp @@ -174,7 +174,7 @@ QByteArray ModelEditor::saveState() const return saveState(currentDiagram()); } -bool ModelEditor::restoreState(const QByteArray &state) +void ModelEditor::restoreState(const QByteArray &state) { QDataStream stream(state); int version = 0; @@ -198,11 +198,9 @@ bool ModelEditor::restoreState(const QByteArray &state) qmt::MDiagram *diagram = d->document->documentController()->modelController()->findObject(uid); if (diagram) { openDiagram(diagram, false); - return true; } } } - return false; } void ModelEditor::init() diff --git a/src/plugins/modeleditor/modeleditor.h b/src/plugins/modeleditor/modeleditor.h index 70cdb62e33e..dc8b26e5cfb 100644 --- a/src/plugins/modeleditor/modeleditor.h +++ b/src/plugins/modeleditor/modeleditor.h @@ -69,7 +69,7 @@ public: Core::IDocument *document() const override; QWidget *toolBar() override; QByteArray saveState() const override; - bool restoreState(const QByteArray &state) override; + void restoreState(const QByteArray &state) override; qmt::MDiagram *currentDiagram() const; void showDiagram(qmt::MDiagram *diagram); diff --git a/src/plugins/qmljseditor/qmljseditor.cpp b/src/plugins/qmljseditor/qmljseditor.cpp index 08d023b1c51..52272c352d8 100644 --- a/src/plugins/qmljseditor/qmljseditor.cpp +++ b/src/plugins/qmljseditor/qmljseditor.cpp @@ -159,7 +159,7 @@ void QmlJSEditorWidget::finalizeInitialization() createToolBar(); } -bool QmlJSEditorWidget::restoreState(const QByteArray &state) +void QmlJSEditorWidget::restoreState(const QByteArray &state) { QStringList qmlTypes { QmlJSTools::Constants::QML_MIMETYPE, QmlJSTools::Constants::QBS_MIMETYPE, @@ -174,7 +174,7 @@ bool QmlJSEditorWidget::restoreState(const QByteArray &state) foldAuxiliaryData(); } - return TextEditorWidget::restoreState(state); + TextEditorWidget::restoreState(state); } QModelIndex QmlJSEditorWidget::outlineModelIndex() diff --git a/src/plugins/qmljseditor/qmljseditor.h b/src/plugins/qmljseditor/qmljseditor.h index 58a1894c02d..007c34abd1a 100644 --- a/src/plugins/qmljseditor/qmljseditor.h +++ b/src/plugins/qmljseditor/qmljseditor.h @@ -58,7 +58,7 @@ public: QmlJSEditorWidget(); void finalizeInitialization() override; - bool restoreState(const QByteArray &state) override; + void restoreState(const QByteArray &state) override; QmlJSEditorDocument *qmlJsEditorDocument() const; diff --git a/src/plugins/resourceeditor/resourceeditorw.cpp b/src/plugins/resourceeditor/resourceeditorw.cpp index 77ae771aeda..ff711917529 100644 --- a/src/plugins/resourceeditor/resourceeditorw.cpp +++ b/src/plugins/resourceeditor/resourceeditorw.cpp @@ -238,14 +238,12 @@ QByteArray ResourceEditorW::saveState() const return bytes; } -bool ResourceEditorW::restoreState(const QByteArray &state) +void ResourceEditorW::restoreState(const QByteArray &state) { QDataStream stream(state); QByteArray splitterState; stream >> splitterState; - if (!m_resourceEditor->restoreState(splitterState)) - return false; - return true; + m_resourceEditor->restoreState(splitterState); } QWidget *ResourceEditorW::toolBar() diff --git a/src/plugins/resourceeditor/resourceeditorw.h b/src/plugins/resourceeditor/resourceeditorw.h index 90fbc93bb3b..55fd3bfab57 100644 --- a/src/plugins/resourceeditor/resourceeditorw.h +++ b/src/plugins/resourceeditor/resourceeditorw.h @@ -91,7 +91,7 @@ public: // IEditor Core::IDocument *document() const override { return m_resourceDocument; } QByteArray saveState() const override; - bool restoreState(const QByteArray &state) override; + void restoreState(const QByteArray &state) override; QWidget *toolBar() override; private: diff --git a/src/plugins/texteditor/texteditor.cpp b/src/plugins/texteditor/texteditor.cpp index fac21ed0abc..bc711507c78 100644 --- a/src/plugins/texteditor/texteditor.cpp +++ b/src/plugins/texteditor/texteditor.cpp @@ -3003,12 +3003,12 @@ QByteArray TextEditorWidget::saveState() const return state; } -bool TextEditorWidget::restoreState(const QByteArray &state) +void TextEditorWidget::restoreState(const QByteArray &state) { if (state.isEmpty()) { if (d->m_displaySettings.m_autoFoldFirstComment) d->foldLicenseHeader(); - return false; + return; } int version; int vval; @@ -3036,7 +3036,7 @@ bool TextEditorWidget::restoreState(const QByteArray &state) } if (layoutChanged) { auto documentLayout = qobject_cast(doc->documentLayout()); - QTC_ASSERT(documentLayout, return false); + QTC_ASSERT(documentLayout, return ); documentLayout->requestUpdate(); documentLayout->emitDocumentSizeChanged(); } @@ -3068,7 +3068,6 @@ bool TextEditorWidget::restoreState(const QByteArray &state) } d->saveCurrentCursorPositionForNavigation(); - return true; } void TextEditorWidget::setParenthesesMatchingEnabled(bool b) @@ -8446,9 +8445,9 @@ QByteArray BaseTextEditor::saveState() const return editorWidget()->saveState(); } -bool BaseTextEditor::restoreState(const QByteArray &state) +void BaseTextEditor::restoreState(const QByteArray &state) { - return editorWidget()->restoreState(state); + editorWidget()->restoreState(state); } BaseTextEditor *BaseTextEditor::currentTextEditor() diff --git a/src/plugins/texteditor/texteditor.h b/src/plugins/texteditor/texteditor.h index 05a0183e574..1e4ab92497c 100644 --- a/src/plugins/texteditor/texteditor.h +++ b/src/plugins/texteditor/texteditor.h @@ -130,7 +130,7 @@ public: IEditor *duplicate() override; QByteArray saveState() const override; - bool restoreState(const QByteArray &state) override; + void restoreState(const QByteArray &state) override; QWidget *toolBar() override; void contextHelp(const HelpCallback &callback) const override; // from IContext @@ -190,7 +190,7 @@ public: virtual void openFinishedSuccessfully(); // IEditor QByteArray saveState() const; - virtual bool restoreState(const QByteArray &state); + virtual void restoreState(const QByteArray &state); void gotoLine(int line, int column = 0, bool centerLine = true, bool animate = false); int position(TextPositionOperation posOp = CurrentPosition, int at = -1) const;