feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Nim: Normalize somewhat unusal ctor/dtor split

Browse Source 
Change-Id: I65e6fac252c068b11c45d06bcbcbc08c9316a528
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2023-05-03 17:18:49 +02:00
parent 2fa375671a
commit 9106a6e662
2 changed files with 13 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/plugins/nim/settings/nimsettings.cpp
View File

@@ -29,29 +29,6 @@ NimSettings::NimSettings()
setAutoApply(false); setAutoApply(false);
setSettingsGroups("Nim", "NimSuggest"); 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 // code style factory
auto factory = new NimCodeStylePreferencesFactory(); auto factory = new NimCodeStylePreferencesFactory();
TextEditorSettings::registerCodeStyleFactory(factory); TextEditorSettings::registerCodeStyleFactory(factory);
@@ -93,9 +70,17 @@ void NimSettings::InitializeCodeStyleSettings()
Nim::Constants::C_NIMLANGUAGE_ID); Nim::Constants::C_NIMLANGUAGE_ID);
TextEditorSettings::registerMimeTypeForLanguageId(Nim::Constants::C_NIM_SCRIPT_MIMETYPE, TextEditorSettings::registerMimeTypeForLanguageId(Nim::Constants::C_NIM_SCRIPT_MIMETYPE,
Nim::Constants::C_NIMLANGUAGE_ID); 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::unregisterCodeStyle(Nim::Constants::C_NIMLANGUAGE_ID);
TextEditorSettings::unregisterCodeStylePool(Nim::Constants::C_NIMLANGUAGE_ID); TextEditorSettings::unregisterCodeStylePool(Nim::Constants::C_NIMLANGUAGE_ID);
@@ -105,6 +90,10 @@ void NimSettings::TerminateCodeStyleSettings()
m_globalCodeStyle = nullptr; m_globalCodeStyle = nullptr;
} }
SimpleCodeStylePreferences *NimSettings::globalCodeStyle()
{
return m_globalCodeStyle;
}
// NimToolSettingsPage // NimToolSettingsPage

4
src/plugins/nim/settings/nimsettings.h
View File

@@ -19,10 +19,6 @@ public:
Utils::StringAspect nimSuggestPath; Utils::StringAspect nimSuggestPath;
static TextEditor::SimpleCodeStylePreferences *globalCodeStyle(); static TextEditor::SimpleCodeStylePreferences *globalCodeStyle();
private:
void InitializeCodeStyleSettings();
void TerminateCodeStyleSettings();
}; };
class NimToolsSettingsPage final : public Core::IOptionsPage class NimToolsSettingsPage final : public Core::IOptionsPage