From 481a00c298f4aa3348ca034a74defcf95f07d0c4 Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 3 Feb 2020 08:54:44 +0100 Subject: TextEditor: Drop some indirection of texteditor signalling This is one of the few remaining users of the QObject inheritance of IOptionPage. While ok from an architectural point of view, this setup is not and has not been used elsewhere, and eats a few bytes and cycles. Change-Id: Id067f501d284d0726e8952345a2acd058dabbcd5 Reviewed-by: hjk Reviewed-by: David Schulz --- src/plugins/texteditor/behaviorsettingspage.cpp | 9 +++++---- src/plugins/texteditor/behaviorsettingspage.h | 6 ------ src/plugins/texteditor/displaysettingspage.cpp | 5 +++-- src/plugins/texteditor/displaysettingspage.h | 4 ---- src/plugins/texteditor/texteditorsettings.cpp | 16 ++-------------- 5 files changed, 10 insertions(+), 30 deletions(-) (limited to 'src/plugins/texteditor') diff --git a/src/plugins/texteditor/behaviorsettingspage.cpp b/src/plugins/texteditor/behaviorsettingspage.cpp index 27c079db20f..149e537b668 100644 --- a/src/plugins/texteditor/behaviorsettingspage.cpp +++ b/src/plugins/texteditor/behaviorsettingspage.cpp @@ -34,6 +34,7 @@ #include "simplecodestylepreferences.h" #include "texteditorconstants.h" #include "codestylepool.h" +#include "texteditorsettings.h" #include #include @@ -159,7 +160,7 @@ void BehaviorSettingsPage::apply() if (s) d->m_typingSettings.toSettings(d->m_settingsPrefix, s); - emit typingSettingsChanged(newTypingSettings); + emit TextEditorSettings::instance()->typingSettingsChanged(newTypingSettings); } if (newStorageSettings != d->m_storageSettings) { @@ -167,7 +168,7 @@ void BehaviorSettingsPage::apply() if (s) d->m_storageSettings.toSettings(d->m_settingsPrefix, s); - emit storageSettingsChanged(newStorageSettings); + emit TextEditorSettings::instance()->storageSettingsChanged(newStorageSettings); } if (newBehaviorSettings != d->m_behaviorSettings) { @@ -175,7 +176,7 @@ void BehaviorSettingsPage::apply() if (s) d->m_behaviorSettings.toSettings(d->m_settingsPrefix, s); - emit behaviorSettingsChanged(newBehaviorSettings); + emit TextEditorSettings::instance()->behaviorSettingsChanged(newBehaviorSettings); } if (newExtraEncodingSettings != d->m_extraEncodingSettings) { @@ -183,7 +184,7 @@ void BehaviorSettingsPage::apply() if (s) d->m_extraEncodingSettings.toSettings(d->m_settingsPrefix, s); - emit extraEncodingSettingsChanged(newExtraEncodingSettings); + emit TextEditorSettings::instance()->extraEncodingSettingsChanged(newExtraEncodingSettings); } if (s) { diff --git a/src/plugins/texteditor/behaviorsettingspage.h b/src/plugins/texteditor/behaviorsettingspage.h index 475d5172169..66ae00377ec 100644 --- a/src/plugins/texteditor/behaviorsettingspage.h +++ b/src/plugins/texteditor/behaviorsettingspage.h @@ -61,12 +61,6 @@ public: const BehaviorSettings &behaviorSettings() const; const ExtraEncodingSettings &extraEncodingSettings() const; -signals: - void typingSettingsChanged(const TextEditor::TypingSettings &); - void storageSettingsChanged(const TextEditor::StorageSettings &); - void behaviorSettingsChanged(const TextEditor::BehaviorSettings &); - void extraEncodingSettingsChanged(const TextEditor::ExtraEncodingSettings &); - private: void openCodingStylePreferences(TextEditor::TabSettingsWidget::CodingStyleLink link); diff --git a/src/plugins/texteditor/displaysettingspage.cpp b/src/plugins/texteditor/displaysettingspage.cpp index 58890c14c7d..81423c84005 100644 --- a/src/plugins/texteditor/displaysettingspage.cpp +++ b/src/plugins/texteditor/displaysettingspage.cpp @@ -28,6 +28,7 @@ #include "displaysettings.h" #include "marginsettings.h" #include "texteditorconstants.h" +#include "texteditorsettings.h" #include "ui_displaysettingspage.h" #include @@ -178,14 +179,14 @@ void DisplaySettingsPage::setDisplaySettings(const DisplaySettings &newDisplaySe d->m_displaySettings = newDisplaySettings; d->m_displaySettings.toSettings(d->m_settingsPrefix, Core::ICore::settings()); - emit displaySettingsChanged(newDisplaySettings); + emit TextEditorSettings::instance()->displaySettingsChanged(newDisplaySettings); } if (newMarginSettings != d->m_marginSettings) { d->m_marginSettings = newMarginSettings; d->m_marginSettings.toSettings(d->m_settingsPrefix, Core::ICore::settings()); - emit marginSettingsChanged(newMarginSettings); + emit TextEditorSettings::instance()->marginSettingsChanged(newMarginSettings); } } diff --git a/src/plugins/texteditor/displaysettingspage.h b/src/plugins/texteditor/displaysettingspage.h index b01aad48065..7c1f91c4bc9 100644 --- a/src/plugins/texteditor/displaysettingspage.h +++ b/src/plugins/texteditor/displaysettingspage.h @@ -50,10 +50,6 @@ public: const DisplaySettings &displaySettings() const; const MarginSettings &marginSettings() const; -signals: - void displaySettingsChanged(const TextEditor::DisplaySettings &); - void marginSettingsChanged(const TextEditor::MarginSettings &); - private: void settingsFromUI(DisplaySettings &displaySettings, MarginSettings &marginSettings) const; void settingsToUI(); diff --git a/src/plugins/texteditor/texteditorsettings.cpp b/src/plugins/texteditor/texteditorsettings.cpp index c797659a238..ed822f20801 100644 --- a/src/plugins/texteditor/texteditorsettings.cpp +++ b/src/plugins/texteditor/texteditorsettings.cpp @@ -361,30 +361,18 @@ TextEditorSettings::TextEditorSettings() connect(this, &TextEditorSettings::fontSettingsChanged, this, updateGeneralMessagesFontSettings); updateGeneralMessagesFontSettings(); - connect(&d->m_behaviorSettingsPage, &BehaviorSettingsPage::typingSettingsChanged, - this, &TextEditorSettings::typingSettingsChanged); - connect(&d->m_behaviorSettingsPage, &BehaviorSettingsPage::storageSettingsChanged, - this, &TextEditorSettings::storageSettingsChanged); auto updateGeneralMessagesBehaviorSettings = []() { bool wheelZoom = d->m_behaviorSettingsPage.behaviorSettings().m_scrollWheelZooming; Core::MessageManager::setWheelZoomEnabled(wheelZoom); }; - connect(&d->m_behaviorSettingsPage, &BehaviorSettingsPage::behaviorSettingsChanged, - this, &TextEditorSettings::behaviorSettingsChanged); - connect(&d->m_behaviorSettingsPage, &BehaviorSettingsPage::behaviorSettingsChanged, + connect(this, &TextEditorSettings::behaviorSettingsChanged, this, updateGeneralMessagesBehaviorSettings); updateGeneralMessagesBehaviorSettings(); - connect(&d->m_behaviorSettingsPage, &BehaviorSettingsPage::extraEncodingSettingsChanged, - this, &TextEditorSettings::extraEncodingSettingsChanged); - connect(&d->m_displaySettingsPage, &DisplaySettingsPage::marginSettingsChanged, - this, &TextEditorSettings::marginSettingsChanged); - connect(&d->m_displaySettingsPage, &DisplaySettingsPage::displaySettingsChanged, - this, &TextEditorSettings::displaySettingsChanged); auto updateCamelCaseNavigation = [] { Utils::FancyLineEdit::setCamelCaseNavigationEnabled(behaviorSettings().m_camelCaseNavigation); }; - connect(&d->m_behaviorSettingsPage, &BehaviorSettingsPage::behaviorSettingsChanged, + connect(this, &TextEditorSettings::behaviorSettingsChanged, this, updateCamelCaseNavigation); updateCamelCaseNavigation(); } -- cgit v1.2.3