diff --git a/src/plugins/nim/settings/nimsettings.cpp b/src/plugins/nim/settings/nimsettings.cpp index 5904b8b6e60..fb18177800d 100644 --- a/src/plugins/nim/settings/nimsettings.cpp +++ b/src/plugins/nim/settings/nimsettings.cpp @@ -29,29 +29,6 @@ NimSettings::NimSettings() setAutoApply(false); setSettingsGroups("Nim", "NimSuggest"); - InitializeCodeStyleSettings(); - - registerAspect(&nimSuggestPath); - nimSuggestPath.setSettingsKey("Command"); - nimSuggestPath.setDisplayStyle(StringAspect::PathChooserDisplay); - nimSuggestPath.setExpectedKind(PathChooser::ExistingCommand); - nimSuggestPath.setLabelText(Tr::tr("Path:")); - - readSettings(Core::ICore::settings()); -} - -NimSettings::~NimSettings() -{ - TerminateCodeStyleSettings(); -} - -SimpleCodeStylePreferences *NimSettings::globalCodeStyle() -{ - return m_globalCodeStyle; -} - -void NimSettings::InitializeCodeStyleSettings() -{ // code style factory auto factory = new NimCodeStylePreferencesFactory(); TextEditorSettings::registerCodeStyleFactory(factory); @@ -93,9 +70,17 @@ void NimSettings::InitializeCodeStyleSettings() Nim::Constants::C_NIMLANGUAGE_ID); TextEditorSettings::registerMimeTypeForLanguageId(Nim::Constants::C_NIM_SCRIPT_MIMETYPE, Nim::Constants::C_NIMLANGUAGE_ID); + + registerAspect(&nimSuggestPath); + nimSuggestPath.setSettingsKey("Command"); + nimSuggestPath.setDisplayStyle(StringAspect::PathChooserDisplay); + nimSuggestPath.setExpectedKind(PathChooser::ExistingCommand); + nimSuggestPath.setLabelText(Tr::tr("Path:")); + + readSettings(Core::ICore::settings()); } -void NimSettings::TerminateCodeStyleSettings() +NimSettings::~NimSettings() { TextEditorSettings::unregisterCodeStyle(Nim::Constants::C_NIMLANGUAGE_ID); TextEditorSettings::unregisterCodeStylePool(Nim::Constants::C_NIMLANGUAGE_ID); @@ -105,6 +90,10 @@ void NimSettings::TerminateCodeStyleSettings() m_globalCodeStyle = nullptr; } +SimpleCodeStylePreferences *NimSettings::globalCodeStyle() +{ + return m_globalCodeStyle; +} // NimToolSettingsPage diff --git a/src/plugins/nim/settings/nimsettings.h b/src/plugins/nim/settings/nimsettings.h index d144618f7d2..1e8546b3336 100644 --- a/src/plugins/nim/settings/nimsettings.h +++ b/src/plugins/nim/settings/nimsettings.h @@ -19,10 +19,6 @@ public: Utils::StringAspect nimSuggestPath; static TextEditor::SimpleCodeStylePreferences *globalCodeStyle(); - -private: - void InitializeCodeStyleSettings(); - void TerminateCodeStyleSettings(); }; class NimToolsSettingsPage final : public Core::IOptionsPage