diff --git a/src/plugins/nim/nimplugin.cpp b/src/plugins/nim/nimplugin.cpp index fcca3ef8d38..b3ef6fc49f0 100644 --- a/src/plugins/nim/nimplugin.cpp +++ b/src/plugins/nim/nimplugin.cpp @@ -62,7 +62,6 @@ public: NimCompilerBuildStepFactory buildStepFactory; NimCompilerCleanStepFactory cleanStepFactory; NimCodeStyleSettingsPage codeStyleSettingsPage; - NimToolsSettingsPage toolsSettingsPage{&settings}; NimCodeStylePreferencesFactory codeStylePreferencesPage; NimToolChainFactory toolChainFactory; diff --git a/src/plugins/nim/settings/nimsettings.cpp b/src/plugins/nim/settings/nimsettings.cpp index fb18177800d..036045fada4 100644 --- a/src/plugins/nim/settings/nimsettings.cpp +++ b/src/plugins/nim/settings/nimsettings.cpp @@ -29,6 +29,24 @@ NimSettings::NimSettings() setAutoApply(false); setSettingsGroups("Nim", "NimSuggest"); + setId(Nim::Constants::C_NIMTOOLSSETTINGSPAGE_ID); + setDisplayName(Tr::tr("Tools")); + setCategory(Nim::Constants::C_NIMTOOLSSETTINGSPAGE_CATEGORY); + setDisplayCategory(Tr::tr("Nim")); + setCategoryIconPath(":/nim/images/settingscategory_nim.png"); + setSettings(this); + + setLayouter([this](QWidget *widget) { + using namespace Layouting; + Column { + Group { + title("Nimsuggest"), + Column { nimSuggestPath } + }, + st + }.attachTo(widget); + }); + // code style factory auto factory = new NimCodeStylePreferencesFactory(); TextEditorSettings::registerCodeStyleFactory(factory); @@ -95,27 +113,4 @@ SimpleCodeStylePreferences *NimSettings::globalCodeStyle() return m_globalCodeStyle; } -// NimToolSettingsPage - -NimToolsSettingsPage::NimToolsSettingsPage(NimSettings *settings) -{ - setId(Nim::Constants::C_NIMTOOLSSETTINGSPAGE_ID); - setDisplayName(Tr::tr("Tools")); - setCategory(Nim::Constants::C_NIMTOOLSSETTINGSPAGE_CATEGORY); - setDisplayCategory(Tr::tr("Nim")); - setCategoryIconPath(":/nim/images/settingscategory_nim.png"); - setSettings(settings); - - setLayouter([settings](QWidget *widget) { - using namespace Layouting; - Column { - Group { - title("Nimsuggest"), - Column { settings->nimSuggestPath } - }, - st - }.attachTo(widget); - }); -} - } // namespace Nim diff --git a/src/plugins/nim/settings/nimsettings.h b/src/plugins/nim/settings/nimsettings.h index 1e8546b3336..57beb64f45d 100644 --- a/src/plugins/nim/settings/nimsettings.h +++ b/src/plugins/nim/settings/nimsettings.h @@ -4,13 +4,12 @@ #pragma once #include -#include namespace TextEditor { class SimpleCodeStylePreferences; } namespace Nim { -class NimSettings : public Utils::AspectContainer +class NimSettings : public Core::PagedSettings { public: NimSettings(); @@ -21,11 +20,5 @@ public: static TextEditor::SimpleCodeStylePreferences *globalCodeStyle(); }; -class NimToolsSettingsPage final : public Core::IOptionsPage -{ -public: - explicit NimToolsSettingsPage(NimSettings *settings); -}; - } // Nim