Editors: Provide a base implementation for {save,restore}State

Change-Id: Iedfc0d59ecfe257ad5823cff39977bce82ada3a5
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

11 files changed, 3 insertions, 79 deletions

diff --git a/src/plugins/bineditor/bineditorplugin.cpp b/src/plugins/bineditor/bineditorplugin.cpp
index 182ac0c7f7..f6e401dae7 100644
--- a/src/plugins/bineditor/bineditorplugin.cpp
+++ b/src/plugins/bineditor/bineditorplugin.cpp
@@ -364,9 +364,6 @@ public:
     QString displayName() const { return m_displayName; }
     void setDisplayName(const QString &title) { m_displayName = title; emit changed(); }
 
-    QByteArray saveState() const { return QByteArray(); } // not supported
-    bool restoreState(const QByteArray & /* state */) { return false; }  // not supported
-
     QWidget *toolBar() { return m_toolBar; }
 
     bool isTemporary() const { return m_editor->isMemoryView(); }
diff --git a/src/plugins/coreplugin/editormanager/ieditor.h b/src/plugins/coreplugin/editormanager/ieditor.h
index ed2ac2285a..c544616224 100644
--- a/src/plugins/coreplugin/editormanager/ieditor.h
+++ b/src/plugins/coreplugin/editormanager/ieditor.h
@@ -42,8 +42,8 @@ class IDocument;
 class CORE_EXPORT IEditor : public IContext
 {
     Q_OBJECT
-public:
 
+public:
     IEditor(QObject *parent = 0) : IContext(parent) {}
     virtual ~IEditor() {}
 
@@ -57,8 +57,8 @@ public:
     virtual bool duplicateSupported() const { return false; }
     virtual IEditor *duplicate(QWidget */*parent*/) { return 0; }
 
-    virtual QByteArray saveState() const = 0;
-    virtual bool restoreState(const QByteArray &state) = 0;
+    virtual QByteArray saveState() const { return QByteArray(); }
+    virtual bool restoreState(const QByteArray &/*state*/) { return true; }
 
     virtual int currentLine() const { return 0; }
     virtual int currentColumn() const { return 0; }
diff --git a/src/plugins/diffeditor/diffeditoreditable.cpp b/src/plugins/diffeditor/diffeditoreditable.cpp
index 5d252b2701..50f1f0f2e7 100644
--- a/src/plugins/diffeditor/diffeditoreditable.cpp
+++ b/src/plugins/diffeditor/diffeditoreditable.cpp
@@ -225,15 +225,4 @@ void DiffEditorEditable::activateEntry(int index)
     updateEntryToolTip();
 }
 
-QByteArray DiffEditorEditable::saveState() const
-{
-    return QByteArray();
-}
-
-bool DiffEditorEditable::restoreState(const QByteArray &state)
-{
-    Q_UNUSED(state)
-    return true;
-}
-
 } // namespace DiffEditor
diff --git a/src/plugins/diffeditor/diffeditoreditable.h b/src/plugins/diffeditor/diffeditoreditable.h
index d8a5079aba..8a0aff264e 100644
--- a/src/plugins/diffeditor/diffeditoreditable.h
+++ b/src/plugins/diffeditor/diffeditoreditable.h
@@ -71,8 +71,6 @@ public:
 
     QWidget *toolBar();
 
-    QByteArray saveState() const;
-    bool restoreState(const QByteArray &state);
 public slots:
     void activateEntry(int index);
 
diff --git a/src/plugins/imageviewer/imageviewer.cpp b/src/plugins/imageviewer/imageviewer.cpp
index 25b87814bf..58a4e77e8a 100644
--- a/src/plugins/imageviewer/imageviewer.cpp
+++ b/src/plugins/imageviewer/imageviewer.cpp
@@ -163,27 +163,6 @@ void ImageViewer::setDisplayName(const QString &title)
     emit changed();
 }
 
-QByteArray ImageViewer::saveState() const
-{
-    return QByteArray();
-}
-
-bool ImageViewer::restoreState(const QByteArray &state)
-{
-    Q_UNUSED(state);
-    return true;
-}
-
-int ImageViewer::currentLine() const
-{
-    return 0;
-}
-
-int ImageViewer::currentColumn() const
-{
-    return 0;
-}
-
 bool ImageViewer::isTemporary() const
 {
     return false;
diff --git a/src/plugins/imageviewer/imageviewer.h b/src/plugins/imageviewer/imageviewer.h
index 588399be10..b5a2068921 100644
--- a/src/plugins/imageviewer/imageviewer.h
+++ b/src/plugins/imageviewer/imageviewer.h
@@ -60,15 +60,7 @@ public:
     Core::Id id() const;
     QString displayName() const;
     void setDisplayName(const QString &title);
-
-    QByteArray saveState() const;
-    bool restoreState(const QByteArray &state);
-
-    int currentLine() const;
-    int currentColumn() const;
-
     bool isTemporary() const;
-
     QWidget *toolBar();
 
 public slots:
diff --git a/src/plugins/qnx/bardescriptoreditor.cpp b/src/plugins/qnx/bardescriptoreditor.cpp
index 74e41065fd..a33dab4a31 100644
--- a/src/plugins/qnx/bardescriptoreditor.cpp
+++ b/src/plugins/qnx/bardescriptoreditor.cpp
@@ -118,17 +118,6 @@ void BarDescriptorEditor::setDisplayName(const QString &title)
     emit changed();
 }
 
-QByteArray BarDescriptorEditor::saveState() const
-{
-    return QByteArray(); // Not supported
-}
-
-bool BarDescriptorEditor::restoreState(const QByteArray &state)
-{
-    Q_UNUSED(state);
-    return false; // Not supported
-}
-
 bool BarDescriptorEditor::isTemporary() const
 {
     return false;
diff --git a/src/plugins/qnx/bardescriptoreditor.h b/src/plugins/qnx/bardescriptoreditor.h
index c5d38c91bc..b8bd6bfd9f 100644
--- a/src/plugins/qnx/bardescriptoreditor.h
+++ b/src/plugins/qnx/bardescriptoreditor.h
@@ -69,12 +69,7 @@ public:
     Core::Id id() const;
     QString displayName() const;
     void setDisplayName(const QString &title);
-
-    QByteArray saveState() const;
-    bool restoreState(const QByteArray &state);
-
     bool isTemporary() const;
-
     QWidget *toolBar();
 
     EditorPage activePage() const;
diff --git a/src/plugins/resourceeditor/resourceeditorw.h b/src/plugins/resourceeditor/resourceeditorw.h
index 08a53ad664..22d71f69c8 100644
--- a/src/plugins/resourceeditor/resourceeditorw.h
+++ b/src/plugins/resourceeditor/resourceeditorw.h
@@ -88,8 +88,6 @@ public:
     QString displayName() const { return m_displayName; }
     void setDisplayName(const QString &title) { m_displayName = title; emit changed(); }
     QWidget *toolBar();
-    QByteArray saveState() const { return QByteArray(); }
-    bool restoreState(const QByteArray &/*state*/) { return true; }
 
     void setSuggestedFileName(const QString &fileName);
     bool isTemporary() const { return false; }
diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
index f25e643211..d71c8866f9 100644
--- a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
+++ b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
@@ -437,16 +437,6 @@ QWidget *VcsBaseSubmitEditor::toolBar()
     return d->m_toolWidget;
 }
 
-QByteArray VcsBaseSubmitEditor::saveState() const
-{
-    return QByteArray();
-}
-
-bool VcsBaseSubmitEditor::restoreState(const QByteArray &/*state*/)
-{
-    return true;
-}
-
 QStringList VcsBaseSubmitEditor::checkedFiles() const
 {
     return d->m_widget->checkedFiles();
diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.h b/src/plugins/vcsbase/vcsbasesubmiteditor.h
index efef3d4d62..adf27dd39b 100644
--- a/src/plugins/vcsbase/vcsbasesubmiteditor.h
+++ b/src/plugins/vcsbase/vcsbasesubmiteditor.h
@@ -121,9 +121,6 @@ public:
 
     QWidget *toolBar();
 
-    QByteArray saveState() const;
-    bool restoreState(const QByteArray &state);
-
     QStringList checkedFiles() const;
 
     void setFileModel(SubmitFileModel *m, const QString &repositoryDirectory = QString());