TextEditor: Move access to smaller settings chunks

Change-Id: Id827edbd19dde54b66cb4349d9c832bc23110adc
Reviewed-by: David Schulz <david.schulz@qt.io>

15 files changed, 30 insertions, 53 deletions

diff --git a/src/plugins/bineditor/bineditorwidget.cpp b/src/plugins/bineditor/bineditorwidget.cpp
index 703f608ac1..1d4765b3ca 100644
--- a/src/plugins/bineditor/bineditorwidget.cpp
+++ b/src/plugins/bineditor/bineditorwidget.cpp
@@ -494,7 +494,7 @@ void BinEditorWidget::changeEvent(QEvent *e)
 void BinEditorWidget::wheelEvent(QWheelEvent *e)
 {
     if (e->modifiers() & Qt::ControlModifier) {
-        if (!TextEditor::TextEditorSettings::behaviorSettings().m_scrollWheelZooming) {
+        if (!TextEditor::globalBehaviorSettings().m_scrollWheelZooming) {
             // When the setting is disabled globally,
             // we have to skip calling QAbstractScrollArea::wheelEvent()
             // that changes zoom in it.
diff --git a/src/plugins/fakevim/fakevimactions.cpp b/src/plugins/fakevim/fakevimactions.cpp
index a7c0eee43a..3fd3e9c31f 100644
--- a/src/plugins/fakevim/fakevimactions.cpp
+++ b/src/plugins/fakevim/fakevimactions.cpp
@@ -190,7 +190,7 @@ FakeVimSettings::FakeVimSettings()
                     text(Tr::tr("Copy Text Editor Settings")),
                     onClicked([this] {
                         TabSettings ts = TextEditorSettings::codeStyle()->tabSettings();
-                        TypingSettings tps = TextEditorSettings::typingSettings();
+                        TypingSettings tps = globalTypingSettings();
                         expandTab.setValue(ts.m_tabPolicy != TabSettings::TabsOnlyTabPolicy);
                         tabStop.setValue(ts.m_tabSize);
                         shiftWidth.setValue(ts.m_indentSize);
diff --git a/src/plugins/projectexplorer/appoutputpane.cpp b/src/plugins/projectexplorer/appoutputpane.cpp
index 9bea0e0d84..898acaba2a 100644
--- a/src/plugins/projectexplorer/appoutputpane.cpp
+++ b/src/plugins/projectexplorer/appoutputpane.cpp
@@ -436,7 +436,7 @@ void AppOutputPane::createNewOutputWindow(RunControl *rc)
 
     auto updateBehaviorSettings = [ow] {
         ow->setWheelZoomEnabled(
-                    TextEditor::TextEditorSettings::behaviorSettings().m_scrollWheelZooming);
+                    TextEditor::globalBehaviorSettings().m_scrollWheelZooming);
     };
 
     updateFontSettings();
diff --git a/src/plugins/projectexplorer/compileoutputwindow.cpp b/src/plugins/projectexplorer/compileoutputwindow.cpp
index a8692b8c5e..8d2b12983b 100644
--- a/src/plugins/projectexplorer/compileoutputwindow.cpp
+++ b/src/plugins/projectexplorer/compileoutputwindow.cpp
@@ -75,7 +75,7 @@ CompileOutputWindow::CompileOutputWindow(QAction *cancelBuildAction) :
 
     auto updateZoomEnabled = [this] {
         m_outputWindow->setWheelZoomEnabled(
-                    TextEditor::TextEditorSettings::behaviorSettings().m_scrollWheelZooming);
+                    TextEditor::globalBehaviorSettings().m_scrollWheelZooming);
     };
 
     updateFontSettings();
diff --git a/src/plugins/projectexplorer/editorconfiguration.cpp b/src/plugins/projectexplorer/editorconfiguration.cpp
index 26b247f7ae..2f40e48159 100644
--- a/src/plugins/projectexplorer/editorconfiguration.cpp
+++ b/src/plugins/projectexplorer/editorconfiguration.cpp
@@ -41,10 +41,10 @@ const Key kCodeStyleCount("EditorConfiguration.CodeStyle.Count");
 struct EditorConfigurationPrivate
 {
     EditorConfigurationPrivate() :
-        m_typingSettings(TextEditorSettings::typingSettings()),
-        m_storageSettings(TextEditorSettings::storageSettings()),
-        m_behaviorSettings(TextEditorSettings::behaviorSettings()),
-        m_extraEncodingSettings(TextEditorSettings::extraEncodingSettings()),
+        m_typingSettings(globalTypingSettings()),
+        m_storageSettings(globalStorageSettings()),
+        m_behaviorSettings(globalBehaviorSettings()),
+        m_extraEncodingSettings(globalExtraEncodingSettings()),
         m_textCodec(Core::EditorManager::defaultTextCodec())
     { }
 
@@ -106,10 +106,10 @@ bool EditorConfiguration::useGlobalSettings() const
 void EditorConfiguration::cloneGlobalSettings()
 {
     d->m_defaultCodeStyle->setTabSettings(TextEditorSettings::codeStyle()->tabSettings());
-    setTypingSettings(TextEditorSettings::typingSettings());
-    setStorageSettings(TextEditorSettings::storageSettings());
-    setBehaviorSettings(TextEditorSettings::behaviorSettings());
-    setExtraEncodingSettings(TextEditorSettings::extraEncodingSettings());
+    setTypingSettings(globalTypingSettings());
+    setStorageSettings(globalStorageSettings());
+    setBehaviorSettings(globalBehaviorSettings());
+    setExtraEncodingSettings(globalExtraEncodingSettings());
     setMarginSettings(TextEditorSettings::marginSettings());
     d->m_textCodec = Core::EditorManager::defaultTextCodec();
 }
@@ -302,10 +302,10 @@ void EditorConfiguration::switchSettings(TextEditorWidget *widget) const
 {
     if (d->m_useGlobal) {
         widget->setMarginSettings(TextEditorSettings::marginSettings());
-        widget->setTypingSettings(TextEditorSettings::typingSettings());
-        widget->setStorageSettings(TextEditorSettings::storageSettings());
-        widget->setBehaviorSettings(TextEditorSettings::behaviorSettings());
-        widget->setExtraEncodingSettings(TextEditorSettings::extraEncodingSettings());
+        widget->setTypingSettings(globalTypingSettings());
+        widget->setStorageSettings(globalStorageSettings());
+        widget->setBehaviorSettings(globalBehaviorSettings());
+        widget->setExtraEncodingSettings(globalExtraEncodingSettings());
         switchSettings_helper(TextEditorSettings::instance(), this, widget);
     } else {
         widget->setMarginSettings(marginSettings());
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardgeneratorfactory.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizardgeneratorfactory.cpp
index 0d75ecb341..b85641f9c3 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonwizardgeneratorfactory.cpp
+++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardgeneratorfactory.cpp
@@ -89,7 +89,7 @@ bool JsonWizardGenerator::formatFile(const JsonWizard *wizard, GeneratedFile *fi
                      QChar::Null,
                      codeStylePrefs->currentTabSettings());
     delete indenter;
-    if (TextEditorSettings::storageSettings().m_cleanWhitespace) {
+    if (globalStorageSettings().m_cleanWhitespace) {
         QTextBlock block = doc.firstBlock();
         while (block.isValid()) {
             TabSettings::removeTrailingWhitespace(cursor, block);
diff --git a/src/plugins/projectexplorer/projectfilewizardextension.cpp b/src/plugins/projectexplorer/projectfilewizardextension.cpp
index 134db6ea48..7655456392 100644
--- a/src/plugins/projectexplorer/projectfilewizardextension.cpp
+++ b/src/plugins/projectexplorer/projectfilewizardextension.cpp
@@ -250,7 +250,7 @@ void ProjectFileWizardExtension::applyCodeStyle(GeneratedFile *file) const
                      QChar::Null,
                      codeStylePrefs->currentTabSettings());
     delete indenter;
-    if (TextEditorSettings::storageSettings().m_cleanWhitespace) {
+    if (globalStorageSettings().m_cleanWhitespace) {
         QTextBlock block = doc.firstBlock();
         while (block.isValid()) {
             TabSettings::removeTrailingWhitespace(cursor, block);
diff --git a/src/plugins/texteditor/behaviorsettings.h b/src/plugins/texteditor/behaviorsettings.h
index ca1f7da0d9..97835b3a23 100644
--- a/src/plugins/texteditor/behaviorsettings.h
+++ b/src/plugins/texteditor/behaviorsettings.h
@@ -32,9 +32,9 @@ public:
     bool m_smartSelectionChanging;
 };
 
-TEXTEDITOR_EXPORT BehaviorSettings &globalBehaviorSettings();
-
 void setupBehaviorSettings();
 void updateGlobalBehaviorSettings(const BehaviorSettings &newBehaviorSettings);
 
+TEXTEDITOR_EXPORT BehaviorSettings &globalBehaviorSettings();
+
 } // namespace TextEditor
diff --git a/src/plugins/texteditor/extraencodingsettings.h b/src/plugins/texteditor/extraencodingsettings.h
index eeefa360ff..4e025307af 100644
--- a/src/plugins/texteditor/extraencodingsettings.h
+++ b/src/plugins/texteditor/extraencodingsettings.h
@@ -33,6 +33,6 @@ public:
 void setupExtraEncodingSettings();
 void updateGlobalExtraEncodingSettings(const ExtraEncodingSettings &newExtraEncodingSettings);
 
-ExtraEncodingSettings &globalExtraEncodingSettings();
+TEXTEDITOR_EXPORT ExtraEncodingSettings &globalExtraEncodingSettings();
 
 } // TextEditor
diff --git a/src/plugins/texteditor/storagesettings.h b/src/plugins/texteditor/storagesettings.h
index efef5cde1a..2a090cd1df 100644
--- a/src/plugins/texteditor/storagesettings.h
+++ b/src/plugins/texteditor/storagesettings.h
@@ -33,6 +33,6 @@ public:
 void setupStorageSettings();
 void updateGlobalStorageSettings(const StorageSettings &newStorageSettings);
 
-StorageSettings &globalStorageSettings();
+TEXTEDITOR_EXPORT StorageSettings &globalStorageSettings();
 
 } // namespace TextEditor
diff --git a/src/plugins/texteditor/texteditor.cpp b/src/plugins/texteditor/texteditor.cpp
index bbe3bf64bd..396f82bb9a 100644
--- a/src/plugins/texteditor/texteditor.cpp
+++ b/src/plugins/texteditor/texteditor.cpp
@@ -1414,13 +1414,13 @@ void TextEditorWidgetPrivate::setDocument(const QSharedPointer<TextDocument> &do
     else
         m_document->setTabSettings(tabSettings); // also set through code style ???
 
-    q->setTypingSettings(TextEditorSettings::typingSettings());
-    q->setStorageSettings(TextEditorSettings::storageSettings());
-    q->setBehaviorSettings(TextEditorSettings::behaviorSettings());
+    q->setTypingSettings(globalTypingSettings());
+    q->setStorageSettings(globalStorageSettings());
+    q->setBehaviorSettings(globalBehaviorSettings());
     q->setMarginSettings(TextEditorSettings::marginSettings());
     q->setDisplaySettings(TextEditorSettings::displaySettings());
     q->setCompletionSettings(TextEditorSettings::completionSettings());
-    q->setExtraEncodingSettings(TextEditorSettings::extraEncodingSettings());
+    q->setExtraEncodingSettings(globalExtraEncodingSettings());
     q->setCodeStyle(TextEditorSettings::codeStyle(m_tabSettingsId));
 
     m_blockCount = doc->document()->blockCount();
diff --git a/src/plugins/texteditor/texteditorsettings.cpp b/src/plugins/texteditor/texteditorsettings.cpp
index 9a06d27732..ca499f613b 100644
--- a/src/plugins/texteditor/texteditorsettings.cpp
+++ b/src/plugins/texteditor/texteditorsettings.cpp
@@ -35,6 +35,7 @@
 
 using namespace TextEditor::Constants;
 using namespace TextEditor::Internal;
+using namespace Utils;
 
 namespace TextEditor {
 namespace Internal {
@@ -442,7 +443,7 @@ TextEditorSettings::TextEditorSettings()
     updateGeneralMessagesBehaviorSettings();
 
     auto updateCamelCaseNavigation = [] {
-        Utils::FancyLineEdit::setCamelCaseNavigationEnabled(behaviorSettings().m_camelCaseNavigation);
+        FancyLineEdit::setCamelCaseNavigationEnabled(globalBehaviorSettings().m_camelCaseNavigation);
     };
     connect(this, &TextEditorSettings::behaviorSettingsChanged,
             this, updateCamelCaseNavigation);
@@ -466,21 +467,6 @@ const FontSettings &TextEditorSettings::fontSettings()
     return d->m_fontSettings;
 }
 
-const TypingSettings &TextEditorSettings::typingSettings()
-{
-    return d->m_behaviorSettingsPage.typingSettings();
-}
-
-const StorageSettings &TextEditorSettings::storageSettings()
-{
-    return d->m_behaviorSettingsPage.storageSettings();
-}
-
-const BehaviorSettings &TextEditorSettings::behaviorSettings()
-{
-    return d->m_behaviorSettingsPage.behaviorSettings();
-}
-
 const MarginSettings &TextEditorSettings::marginSettings()
 {
     return d->m_displaySettingsPage.marginSettings();
@@ -501,11 +487,6 @@ const HighlighterSettings &TextEditorSettings::highlighterSettings()
     return d->m_highlighterSettingsPage.highlighterSettings();
 }
 
-const ExtraEncodingSettings &TextEditorSettings::extraEncodingSettings()
-{
-    return d->m_behaviorSettingsPage.extraEncodingSettings();
-}
-
 void TextEditorSettings::setCommentsSettingsRetriever(
     const std::function<CommentsSettings::Data(const Utils::FilePath &)> &retrieve)
 {
diff --git a/src/plugins/texteditor/texteditorsettings.h b/src/plugins/texteditor/texteditorsettings.h
index 8876687c7a..88dd057608 100644
--- a/src/plugins/texteditor/texteditorsettings.h
+++ b/src/plugins/texteditor/texteditorsettings.h
@@ -49,14 +49,10 @@ public:
     static TextEditorSettings *instance();
 
     static const FontSettings &fontSettings();
-    static const TypingSettings &typingSettings();
-    static const StorageSettings &storageSettings();
-    static const BehaviorSettings &behaviorSettings();
     static const MarginSettings &marginSettings();
     static const DisplaySettings &displaySettings();
     static const CompletionSettings &completionSettings();
     static const HighlighterSettings &highlighterSettings();
-    static const ExtraEncodingSettings &extraEncodingSettings();
 
     static void setCommentsSettingsRetriever(
         const std::function<CommentsSettings::Data(const Utils::FilePath &)> &);
diff --git a/src/plugins/texteditor/typingsettings.h b/src/plugins/texteditor/typingsettings.h
index cbf934ac88..5cdd8df2ac 100644
--- a/src/plugins/texteditor/typingsettings.h
+++ b/src/plugins/texteditor/typingsettings.h
@@ -57,7 +57,7 @@ public:
 void setupTypingSettings();
 void updateGlobalTypingSettings(const TypingSettings &newTypingSettings);
 
-TypingSettings &globalTypingSettings();
+TEXTEDITOR_EXPORT TypingSettings &globalTypingSettings();
 
 } // namespace TextEditor
 
diff --git a/src/plugins/vcsbase/vcsoutputwindow.cpp b/src/plugins/vcsbase/vcsoutputwindow.cpp
index 4181fc1cb0..4b6eab6fb1 100644
--- a/src/plugins/vcsbase/vcsoutputwindow.cpp
+++ b/src/plugins/vcsbase/vcsoutputwindow.cpp
@@ -265,7 +265,7 @@ VcsOutputWindow::VcsOutputWindow()
 
     auto updateBehaviorSettings = [] {
         d->widget.setWheelZoomEnabled(
-                    TextEditor::TextEditorSettings::behaviorSettings().m_scrollWheelZooming);
+                    TextEditor::globalBehaviorSettings().m_scrollWheelZooming);
     };
 
     auto updateFontSettings = [] {