Text editor settings cleanup to avoid some copying

6 files changed, 23 insertions, 32 deletions

diff --git a/src/plugins/texteditor/behaviorsettingspage.cpp b/src/plugins/texteditor/behaviorsettingspage.cpp
index 9e6c8fbf8b..94d24b0597 100644
--- a/src/plugins/texteditor/behaviorsettingspage.cpp
+++ b/src/plugins/texteditor/behaviorsettingspage.cpp
@@ -195,17 +195,17 @@ void BehaviorSettingsPage::settingsToUI()
     m_d->m_page.scrollWheelZooming->setChecked(behaviorSettings.m_scrollWheelZooming);
 }
 
-TabSettings BehaviorSettingsPage::tabSettings() const
+const TabSettings &BehaviorSettingsPage::tabSettings() const
 {
     return m_d->m_tabSettings;
 }
 
-StorageSettings BehaviorSettingsPage::storageSettings() const
+const StorageSettings &BehaviorSettingsPage::storageSettings() const
 {
     return m_d->m_storageSettings;
 }
 
-BehaviorSettings BehaviorSettingsPage::behaviorSettings() const
+const BehaviorSettings &BehaviorSettingsPage::behaviorSettings() const
 {
     return m_d->m_behaviorSettings;
 }
diff --git a/src/plugins/texteditor/behaviorsettingspage.h b/src/plugins/texteditor/behaviorsettingspage.h
index 389e0c5947..bd5865013a 100644
--- a/src/plugins/texteditor/behaviorsettingspage.h
+++ b/src/plugins/texteditor/behaviorsettingspage.h
@@ -69,9 +69,9 @@ public:
     void apply();
     void finish() { }
 
-    TabSettings tabSettings() const;
-    StorageSettings storageSettings() const;
-    BehaviorSettings behaviorSettings() const;
+    const TabSettings &tabSettings() const;
+    const StorageSettings &storageSettings() const;
+    const BehaviorSettings &behaviorSettings() const;
 
     virtual bool matches(const QString &s) const;
 
diff --git a/src/plugins/texteditor/displaysettingspage.cpp b/src/plugins/texteditor/displaysettingspage.cpp
index c250ae8ea1..63f0acf9fb 100644
--- a/src/plugins/texteditor/displaysettingspage.cpp
+++ b/src/plugins/texteditor/displaysettingspage.cpp
@@ -113,17 +113,7 @@ void DisplaySettingsPage::apply()
     DisplaySettings newDisplaySettings;
 
     settingsFromUI(newDisplaySettings);
-
-    Core::ICore *core = Core::ICore::instance();
-    QSettings *s = core->settings();
-
-    if (newDisplaySettings != m_d->m_displaySettings) {
-        m_d->m_displaySettings = newDisplaySettings;
-        if (s)
-            m_d->m_displaySettings.toSettings(m_d->m_parameters.settingsPrefix, s);
-
-        emit displaySettingsChanged(newDisplaySettings);
-    }
+    setDisplaySettings(newDisplaySettings);
 }
 
 void DisplaySettingsPage::settingsFromUI(DisplaySettings &displaySettings) const
@@ -157,7 +147,7 @@ void DisplaySettingsPage::settingsToUI()
     m_d->m_page.autoFoldFirstComment->setChecked(displaySettings.m_autoFoldFirstComment);
 }
 
-DisplaySettings DisplaySettingsPage::displaySettings() const
+const DisplaySettings &DisplaySettingsPage::displaySettings() const
 {
     return m_d->m_displaySettings;
 }
diff --git a/src/plugins/texteditor/displaysettingspage.h b/src/plugins/texteditor/displaysettingspage.h
index c6dfe13091..062a59353b 100644
--- a/src/plugins/texteditor/displaysettingspage.h
+++ b/src/plugins/texteditor/displaysettingspage.h
@@ -68,8 +68,7 @@ public:
     void finish() { }
     virtual bool matches(const QString &s) const;
 
-    DisplaySettings displaySettings() const;
-    void setDisplaySettings(const DisplaySettings &);
+    const DisplaySettings &displaySettings() const;
 
 signals:
     void displaySettingsChanged(const TextEditor::DisplaySettings &);
@@ -77,6 +76,8 @@ signals:
 private:
     void settingsFromUI(DisplaySettings &displaySettings) const;
     void settingsToUI();
+    void setDisplaySettings(const DisplaySettings &);
+
     struct DisplaySettingsPagePrivate;
     DisplaySettingsPagePrivate *m_d;
 };
diff --git a/src/plugins/texteditor/texteditorsettings.cpp b/src/plugins/texteditor/texteditorsettings.cpp
index 076448f603..374334c404 100644
--- a/src/plugins/texteditor/texteditorsettings.cpp
+++ b/src/plugins/texteditor/texteditorsettings.cpp
@@ -190,39 +190,39 @@ void TextEditorSettings::initializeEditor(BaseTextEditor *editor)
 
 void TextEditorSettings::fontZoomRequested(int zoom)
 {
-    FontSettings &fs = const_cast<FontSettings&>(m_fontSettingsPage->fontSettings());
+    FontSettings &fs = const_cast<FontSettings&>(fontSettings());
     fs.setFontZoom(qMax(10, fs.fontZoom() + zoom));
     m_fontSettingsPage->saveSettings();
 }
 
 void TextEditorSettings::zoomResetRequested()
 {
-    FontSettings &fs = const_cast<FontSettings&>(m_fontSettingsPage->fontSettings());
+    FontSettings &fs = const_cast<FontSettings&>(fontSettings());
     fs.setFontZoom(100);
     m_fontSettingsPage->saveSettings();
 }
 
-FontSettings TextEditorSettings::fontSettings() const
+const FontSettings &TextEditorSettings::fontSettings() const
 {
     return m_fontSettingsPage->fontSettings();
 }
 
-TabSettings TextEditorSettings::tabSettings() const
+const TabSettings &TextEditorSettings::tabSettings() const
 {
     return m_behaviorSettingsPage->tabSettings();
 }
 
-StorageSettings TextEditorSettings::storageSettings() const
+const StorageSettings &TextEditorSettings::storageSettings() const
 {
     return m_behaviorSettingsPage->storageSettings();
 }
 
-BehaviorSettings TextEditorSettings::behaviorSettings() const
+const BehaviorSettings &TextEditorSettings::behaviorSettings() const
 {
     return m_behaviorSettingsPage->behaviorSettings();
 }
 
-DisplaySettings TextEditorSettings::displaySettings() const
+const DisplaySettings &TextEditorSettings::displaySettings() const
 {
     return m_displaySettingsPage->displaySettings();
 }
diff --git a/src/plugins/texteditor/texteditorsettings.h b/src/plugins/texteditor/texteditorsettings.h
index d1e1219a24..a7d3ebfa59 100644
--- a/src/plugins/texteditor/texteditorsettings.h
+++ b/src/plugins/texteditor/texteditorsettings.h
@@ -63,11 +63,11 @@ public:
 
     void initializeEditor(BaseTextEditor *editor);
 
-    FontSettings fontSettings() const;
-    TabSettings tabSettings() const;
-    StorageSettings storageSettings() const;
-    BehaviorSettings behaviorSettings() const;
-    DisplaySettings displaySettings() const;
+    const FontSettings &fontSettings() const;
+    const TabSettings &tabSettings() const;
+    const StorageSettings &storageSettings() const;
+    const BehaviorSettings &behaviorSettings() const;
+    const DisplaySettings &displaySettings() const;
 
 signals:
     void fontSettingsChanged(const TextEditor::FontSettings &);