summaryrefslogtreecommitdiff
path: root/src/plugins/texteditor/displaysettingspage.cpp
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>2010-01-20 11:27:08 +0100
committerThorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>2010-01-20 12:54:45 +0100
commit545c9b9190e2851473b83976b0d218724242b61f (patch)
treedf025e9d6cb86908d86ceb80605909c60a49bb2e /src/plugins/texteditor/displaysettingspage.cpp
parented5a0fb0b2176ec11f0dea74c4ac38bca4c0c547 (diff)
downloadqt-creator-545c9b9190e2851473b83976b0d218724242b61f.tar.gz
Text editor settings cleanup to avoid some copying
Diffstat (limited to 'src/plugins/texteditor/displaysettingspage.cpp')
-rw-r--r--src/plugins/texteditor/displaysettingspage.cpp14
1 files changed, 2 insertions, 12 deletions
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;
}