TextEditor: Simplify settings initialization

* Consolidate and simplify behaviorSettingsChanged callbacks.
* Do not call the callbacks during initialization, they are called later.

Change-Id: Ica4b601e091de2112c7737047cbffa8a98fc9f70
Reviewed-by: hjk <hjk@qt.io>

1 files changed, 4 insertions, 13 deletions

diff --git a/src/plugins/texteditor/texteditorsettings.cpp b/src/plugins/texteditor/texteditorsettings.cpp
index e3f96fa167..1d7dd89386 100644
--- a/src/plugins/texteditor/texteditorsettings.cpp
+++ b/src/plugins/texteditor/texteditorsettings.cpp
@@ -431,20 +431,11 @@ TextEditorSettings::TextEditorSettings()
     connect(this, &TextEditorSettings::fontSettingsChanged,
             this, updateGeneralMessagesFontSettings);
     updateGeneralMessagesFontSettings();
-    auto updateGeneralMessagesBehaviorSettings = []() {
-        bool wheelZoom = d->m_behaviorSettingsPage.behaviorSettings().m_scrollWheelZooming;
-        Core::MessageManager::setWheelZoomEnabled(wheelZoom);
-    };
-    connect(this, &TextEditorSettings::behaviorSettingsChanged,
-            this, updateGeneralMessagesBehaviorSettings);
-    updateGeneralMessagesBehaviorSettings();
-
-    auto updateCamelCaseNavigation = [] {
-        FancyLineEdit::setCamelCaseNavigationEnabled(globalBehaviorSettings().m_camelCaseNavigation);
-    };
     connect(this, &TextEditorSettings::behaviorSettingsChanged,
-            this, updateCamelCaseNavigation);
-    updateCamelCaseNavigation();
+            this, [](const BehaviorSettings &bs) {
+        Core::MessageManager::setWheelZoomEnabled(bs.m_scrollWheelZooming);
+        FancyLineEdit::setCamelCaseNavigationEnabled(bs.m_camelCaseNavigation);
+    });
 }
 
 TextEditorSettings::~TextEditorSettings()