diff options
25 files changed, 44 insertions, 107 deletions
diff --git a/src/plugins/beautifier/artisticstyle/artisticstyle.cpp b/src/plugins/beautifier/artisticstyle/artisticstyle.cpp index 6926ce88435..a8851b43cc5 100644 --- a/src/plugins/beautifier/artisticstyle/artisticstyle.cpp +++ b/src/plugins/beautifier/artisticstyle/artisticstyle.cpp @@ -58,16 +58,14 @@ using namespace TextEditor; namespace Beautifier { namespace Internal { -namespace ArtisticStyle { ArtisticStyle::ArtisticStyle() { - Core::ActionContainer *menu = Core::ActionManager::createMenu(Constants::ArtisticStyle::MENU_ID); + Core::ActionContainer *menu = Core::ActionManager::createMenu("ArtisticStyle.Menu"); menu->menu()->setTitle(tr("&Artistic Style")); m_formatFile = new QAction(BeautifierPlugin::msgFormatCurrentFile(), this); - menu->addAction(Core::ActionManager::registerAction(m_formatFile, - Constants::ArtisticStyle::ACTION_FORMATFILE)); + menu->addAction(Core::ActionManager::registerAction(m_formatFile, "ArtisticStyle.FormatFile")); connect(m_formatFile, &QAction::triggered, this, &ArtisticStyle::formatFile); Core::ActionManager::actionContainer(Constants::MENU_ID)->addMenu(menu); @@ -78,7 +76,7 @@ ArtisticStyle::ArtisticStyle() QString ArtisticStyle::id() const { - return QLatin1String(Constants::ArtisticStyle::DISPLAY_NAME); + return QLatin1String(Constants::ARTISTICSTYLE_DISPLAY_NAME); } void ArtisticStyle::updateActions(Core::IEditor *editor) @@ -91,7 +89,7 @@ void ArtisticStyle::formatFile() const QString cfgFileName = configurationFile(); if (cfgFileName.isEmpty()) { BeautifierPlugin::showError(BeautifierPlugin::msgCannotGetConfigurationFile( - tr(Constants::ArtisticStyle::DISPLAY_NAME))); + tr(Constants::ARTISTICSTYLE_DISPLAY_NAME))); } else { formatCurrentFile(command(cfgFileName)); } @@ -166,6 +164,5 @@ Command ArtisticStyle::command(const QString &cfgFile) const return command; } -} // namespace ArtisticStyle } // namespace Internal } // namespace Beautifier diff --git a/src/plugins/beautifier/artisticstyle/artisticstyle.h b/src/plugins/beautifier/artisticstyle/artisticstyle.h index 6844f65b089..56eaeb5116f 100644 --- a/src/plugins/beautifier/artisticstyle/artisticstyle.h +++ b/src/plugins/beautifier/artisticstyle/artisticstyle.h @@ -32,7 +32,6 @@ namespace Beautifier { namespace Internal { -namespace ArtisticStyle { class ArtisticStyle : public BeautifierAbstractTool { @@ -56,6 +55,5 @@ private: ArtisticStyleOptionsPage m_page{&m_settings}; }; -} // namespace ArtisticStyle } // namespace Internal } // namespace Beautifier diff --git a/src/plugins/beautifier/artisticstyle/artisticstyleconstants.h b/src/plugins/beautifier/artisticstyle/artisticstyleconstants.h index 3916cfa4366..52bf88cc209 100644 --- a/src/plugins/beautifier/artisticstyle/artisticstyleconstants.h +++ b/src/plugins/beautifier/artisticstyle/artisticstyleconstants.h @@ -29,14 +29,8 @@ namespace Beautifier { namespace Constants { -namespace ArtisticStyle { -const char DISPLAY_NAME[] = QT_TRANSLATE_NOOP("Beautifier::Internal::ArtisticStyle::ArtisticStyle", "Artistic Style"); -const char ACTION_FORMATFILE[] = "ArtisticStyle.FormatFile"; -const char MENU_ID[] = "ArtisticStyle.Menu"; -const char OPTION_ID[] = "ArtisticStyle"; -const char SETTINGS_NAME[] = "artisticstyle"; +const char ARTISTICSTYLE_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("Beautifier::Internal", "Artistic Style"); -} // namespace ArtisticStyle } // namespace Constants } // namespace Beautifier diff --git a/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.cpp b/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.cpp index 922f7477427..729c44c15bb 100644 --- a/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.cpp +++ b/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.cpp @@ -35,7 +35,6 @@ namespace Beautifier { namespace Internal { -namespace ArtisticStyle { class ArtisticStyleOptionsPageWidget : public Core::IOptionsPageWidget { @@ -62,7 +61,7 @@ ArtisticStyleOptionsPageWidget::ArtisticStyleOptionsPageWidget(ArtisticStyleSett ui.command->setExpectedKind(Utils::PathChooser::ExistingCommand); ui.command->setCommandVersionArguments({"--version"}); ui.command->setPromptDialogTitle(BeautifierPlugin::msgCommandPromptDialogTitle( - ArtisticStyle::tr(Constants::ArtisticStyle::DISPLAY_NAME))); + ArtisticStyle::tr(Constants::ARTISTICSTYLE_DISPLAY_NAME))); connect(ui.command, &Utils::PathChooser::validChanged, ui.options, &QWidget::setEnabled); ui.configurations->setSettings(m_settings); @@ -94,12 +93,11 @@ void ArtisticStyleOptionsPageWidget::apply() ArtisticStyleOptionsPage::ArtisticStyleOptionsPage(ArtisticStyleSettings *settings) { - setId(Constants::ArtisticStyle::OPTION_ID); + setId("ArtisticStyle"); setDisplayName(ArtisticStyleOptionsPageWidget::tr("Artistic Style")); setCategory(Constants::OPTION_CATEGORY); setWidgetCreator([settings] { return new ArtisticStyleOptionsPageWidget(settings); }); } -} // namespace ArtisticStyle } // namespace Internal } // namespace Beautifier diff --git a/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.h b/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.h index e31182ebba2..eda00f020ad 100644 --- a/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.h +++ b/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.h @@ -29,7 +29,6 @@ namespace Beautifier { namespace Internal { -namespace ArtisticStyle { class ArtisticStyleSettings; @@ -39,6 +38,5 @@ public: explicit ArtisticStyleOptionsPage(ArtisticStyleSettings *settings); }; -} // namespace ArtisticStyle } // namespace Internal } // namespace Beautifier diff --git a/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.ui b/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.ui index 06f5cfc3e40..127f37105f3 100644 --- a/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.ui +++ b/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>Beautifier::Internal::ArtisticStyle::ArtisticStyleOptionsPage</class> - <widget class="QWidget" name="Beautifier::Internal::ArtisticStyle::ArtisticStyleOptionsPage"> + <class>Beautifier::Internal::ArtisticStyleOptionsPage</class> + <widget class="QWidget" name="Beautifier::Internal::ArtisticStyleOptionsPage"> <property name="geometry"> <rect> <x>0</x> diff --git a/src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp b/src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp index dfb2c57f91c..9a784610175 100644 --- a/src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp +++ b/src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp @@ -43,19 +43,17 @@ namespace Beautifier { namespace Internal { -namespace ArtisticStyle { -namespace { const char USE_OTHER_FILES[] = "useOtherFiles"; const char USE_SPECIFIC_CONFIG_FILE[] = "useSpecificConfigFile"; const char SPECIFIC_CONFIG_FILE[] = "specificConfigFile"; const char USE_HOME_FILE[] = "useHomeFile"; const char USE_CUSTOM_STYLE[] = "useCustomStyle"; const char CUSTOM_STYLE[] = "customStyle"; -} +const char SETTINGS_NAME[] = "artisticstyle"; ArtisticStyleSettings::ArtisticStyleSettings() : - AbstractSettings(Constants::ArtisticStyle::SETTINGS_NAME, ".astyle") + AbstractSettings(SETTINGS_NAME, ".astyle") { connect(&m_versionWatcher, &QFutureWatcherBase::finished, this, &ArtisticStyleSettings::helperSetVersion); @@ -175,7 +173,7 @@ QString ArtisticStyleSettings::documentationFilePath() const { return Core::ICore::userResourcePath() + '/' + Beautifier::Constants::SETTINGS_DIRNAME + '/' + Beautifier::Constants::DOCUMENTATION_DIRNAME + '/' - + Constants::ArtisticStyle::SETTINGS_NAME + ".xml"; + + SETTINGS_NAME + ".xml"; } void ArtisticStyleSettings::createDocumentationFile() const @@ -250,6 +248,5 @@ void ArtisticStyleSettings::createDocumentationFile() const } } -} // namespace ArtisticStyle } // namespace Internal } // namespace Beautifier diff --git a/src/plugins/beautifier/artisticstyle/artisticstylesettings.h b/src/plugins/beautifier/artisticstyle/artisticstylesettings.h index 50deba87d6f..e0fa1b8866e 100644 --- a/src/plugins/beautifier/artisticstyle/artisticstylesettings.h +++ b/src/plugins/beautifier/artisticstyle/artisticstylesettings.h @@ -34,7 +34,6 @@ namespace Beautifier { namespace Internal { -namespace ArtisticStyle { class ArtisticStyleSettings : public AbstractSettings { @@ -77,6 +76,5 @@ private: QFutureWatcher<int> m_versionWatcher; }; -} // namespace ArtisticStyle } // namespace Internal } // namespace Beautifier diff --git a/src/plugins/beautifier/beautifierplugin.cpp b/src/plugins/beautifier/beautifierplugin.cpp index fa74da7e26f..661b41d0165 100644 --- a/src/plugins/beautifier/beautifierplugin.cpp +++ b/src/plugins/beautifier/beautifierplugin.cpp @@ -98,9 +98,9 @@ public: GeneralSettings generalSettings; - ArtisticStyle::ArtisticStyle artisticStyleBeautifier; - ClangFormat::ClangFormat clangFormatBeautifier; - Uncrustify::Uncrustify uncrustifyBeautifier; + ArtisticStyle artisticStyleBeautifier; + ClangFormat clangFormatBeautifier; + Uncrustify uncrustifyBeautifier; BeautifierAbstractTool *m_tools[3] { &artisticStyleBeautifier, diff --git a/src/plugins/beautifier/clangformat/clangformat.cpp b/src/plugins/beautifier/clangformat/clangformat.cpp index 16aee422c29..10d32566cf6 100644 --- a/src/plugins/beautifier/clangformat/clangformat.cpp +++ b/src/plugins/beautifier/clangformat/clangformat.cpp @@ -53,35 +53,34 @@ using namespace TextEditor; namespace Beautifier { namespace Internal { -namespace ClangFormat { + +const char MENU_ID[] = "ClangFormat.Menu"; ClangFormat::ClangFormat() { - Core::ActionContainer *menu = Core::ActionManager::createMenu(Constants::ClangFormat::MENU_ID); + Core::ActionContainer *menu = Core::ActionManager::createMenu(MENU_ID); menu->menu()->setTitle(tr("&ClangFormat")); m_formatFile = new QAction(BeautifierPlugin::msgFormatCurrentFile(), this); Core::Command *cmd - = Core::ActionManager::registerAction(m_formatFile, - Constants::ClangFormat::ACTION_FORMATFILE); + = Core::ActionManager::registerAction(m_formatFile, "ClangFormat.FormatFile"); menu->addAction(cmd); connect(m_formatFile, &QAction::triggered, this, &ClangFormat::formatFile); m_formatRange = new QAction(BeautifierPlugin::msgFormatAtCursor(), this); - cmd = Core::ActionManager::registerAction(m_formatRange, - Constants::ClangFormat::ACTION_FORMATATCURSOR); + cmd = Core::ActionManager::registerAction(m_formatRange, "ClangFormat.FormatAtCursor"); menu->addAction(cmd); connect(m_formatRange, &QAction::triggered, this, &ClangFormat::formatAtCursor); m_disableFormattingSelectedText = new QAction(BeautifierPlugin::msgDisableFormattingSelectedText(), this); cmd = Core::ActionManager::registerAction( - m_disableFormattingSelectedText, Constants::ClangFormat::ACTION_DISABLEFORMATTINGSELECTED); + m_disableFormattingSelectedText, "ClangFormat.DisableFormattingSelectedText"); menu->addAction(cmd); connect(m_disableFormattingSelectedText, &QAction::triggered, this, &ClangFormat::disableFormattingSelectedText); - Core::ActionManager::actionContainer(Constants::MENU_ID)->addMenu(menu); + Core::ActionManager::actionContainer(MENU_ID)->addMenu(menu); connect(&m_settings, &ClangFormatSettings::supportedMimeTypesChanged, [this] { updateActions(Core::EditorManager::currentEditor()); }); @@ -89,7 +88,7 @@ ClangFormat::ClangFormat() QString ClangFormat::id() const { - return QLatin1String(Constants::ClangFormat::DISPLAY_NAME); + return QLatin1String(Constants::CLANGFORMAT_DISPLAY_NAME); } void ClangFormat::updateActions(Core::IEditor *editor) @@ -200,6 +199,5 @@ Command ClangFormat::command(int offset, int length) const return c; } -} // namespace ClangFormat } // namespace Internal } // namespace Beautifier diff --git a/src/plugins/beautifier/clangformat/clangformat.h b/src/plugins/beautifier/clangformat/clangformat.h index 83252e99a00..3207f043490 100644 --- a/src/plugins/beautifier/clangformat/clangformat.h +++ b/src/plugins/beautifier/clangformat/clangformat.h @@ -32,7 +32,6 @@ namespace Beautifier { namespace Internal { -namespace ClangFormat { class ClangFormat : public BeautifierAbstractTool { @@ -59,6 +58,5 @@ private: ClangFormatOptionsPage m_page{&m_settings}; }; -} // namespace ClangFormat } // namespace Internal } // namespace Beautifier diff --git a/src/plugins/beautifier/clangformat/clangformatconstants.h b/src/plugins/beautifier/clangformat/clangformatconstants.h index 2c94b347a51..f71203197e4 100644 --- a/src/plugins/beautifier/clangformat/clangformatconstants.h +++ b/src/plugins/beautifier/clangformat/clangformatconstants.h @@ -29,16 +29,8 @@ namespace Beautifier { namespace Constants { -namespace ClangFormat { -const char DISPLAY_NAME[] = QT_TRANSLATE_NOOP("Beautifier::Internal::ClangFormat::ClangFormat", "ClangFormat"); -const char ACTION_FORMATFILE[] = "ClangFormat.FormatFile"; -const char ACTION_FORMATATCURSOR[] = "ClangFormat.FormatAtCursor"; -const char ACTION_DISABLEFORMATTINGSELECTED[] = "ClangFormat.DisableFormattingSelectedText"; -const char MENU_ID[] = "ClangFormat.Menu"; -const char OPTION_ID[] = "ClangFormat"; -const char SETTINGS_NAME[] = "clangformat"; +const char CLANGFORMAT_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("Beautifier::Internal::ClangFormat", "ClangFormat"); -} // namespace ClangFormat } // namespace Constants } // namespace Beautifier diff --git a/src/plugins/beautifier/clangformat/clangformatoptionspage.cpp b/src/plugins/beautifier/clangformat/clangformatoptionspage.cpp index 767b44064c0..6a8e2503534 100644 --- a/src/plugins/beautifier/clangformat/clangformatoptionspage.cpp +++ b/src/plugins/beautifier/clangformat/clangformatoptionspage.cpp @@ -34,7 +34,6 @@ namespace Beautifier { namespace Internal { -namespace ClangFormat { class ClangFormatOptionsPageWidget : public Core::IOptionsPageWidget { @@ -104,12 +103,11 @@ void ClangFormatOptionsPageWidget::apply() ClangFormatOptionsPage::ClangFormatOptionsPage(ClangFormatSettings *settings) { - setId(Constants::ClangFormat::OPTION_ID); + setId("ClangFormat"); setDisplayName(ClangFormatOptionsPageWidget::tr("Clang Format")); setCategory(Constants::OPTION_CATEGORY); setWidgetCreator([settings] { return new ClangFormatOptionsPageWidget(settings); }); } -} // namespace ClangFormat } // namespace Internal } // namespace Beautifier diff --git a/src/plugins/beautifier/clangformat/clangformatoptionspage.h b/src/plugins/beautifier/clangformat/clangformatoptionspage.h index 5e5013feef2..ac2621cbf29 100644 --- a/src/plugins/beautifier/clangformat/clangformatoptionspage.h +++ b/src/plugins/beautifier/clangformat/clangformatoptionspage.h @@ -29,7 +29,6 @@ namespace Beautifier { namespace Internal { -namespace ClangFormat { class ClangFormatSettings; @@ -39,6 +38,5 @@ public: explicit ClangFormatOptionsPage(ClangFormatSettings *settings); }; -} // namespace ClangFormat } // namespace Internal } // namespace Beautifier diff --git a/src/plugins/beautifier/clangformat/clangformatoptionspage.ui b/src/plugins/beautifier/clangformat/clangformatoptionspage.ui index 06f6ef84b25..1cf89000a49 100644 --- a/src/plugins/beautifier/clangformat/clangformatoptionspage.ui +++ b/src/plugins/beautifier/clangformat/clangformatoptionspage.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>Beautifier::Internal::ClangFormat::ClangFormatOptionsPage</class> - <widget class="QWidget" name="Beautifier::Internal::ClangFormat::ClangFormatOptionsPage"> + <class>Beautifier::Internal::ClangFormatOptionsPage</class> + <widget class="QWidget" name="Beautifier::Internal::ClangFormatOptionsPage"> <property name="geometry"> <rect> <x>0</x> diff --git a/src/plugins/beautifier/clangformat/clangformatsettings.cpp b/src/plugins/beautifier/clangformat/clangformatsettings.cpp index 6369c60510f..d2b54167152 100644 --- a/src/plugins/beautifier/clangformat/clangformatsettings.cpp +++ b/src/plugins/beautifier/clangformat/clangformatsettings.cpp @@ -36,17 +36,15 @@ namespace Beautifier { namespace Internal { -namespace ClangFormat { -namespace { const char USE_PREDEFINED_STYLE[] = "usePredefinedStyle"; const char PREDEFINED_STYLE[] = "predefinedStyle"; const char FALLBACK_STYLE[] = "fallbackStyle"; const char CUSTOM_STYLE[] = "customStyle"; -} +const char SETTINGS_NAME[] = "clangformat"; ClangFormatSettings::ClangFormatSettings() : - AbstractSettings(Constants::ClangFormat::SETTINGS_NAME, ".clang-format") + AbstractSettings(SETTINGS_NAME, ".clang-format") { setCommand("clang-format"); m_settings.insert(USE_PREDEFINED_STYLE, QVariant(true)); @@ -60,7 +58,7 @@ QString ClangFormatSettings::documentationFilePath() const { return Core::ICore::userResourcePath() + '/' + Beautifier::Constants::SETTINGS_DIRNAME + '/' + Beautifier::Constants::DOCUMENTATION_DIRNAME + '/' - + Constants::ClangFormat::SETTINGS_NAME + ".xml"; + + SETTINGS_NAME + ".xml"; } void ClangFormatSettings::createDocumentationFile() const @@ -238,6 +236,5 @@ void ClangFormatSettings::readStyles() } } -} // namespace ClangFormat } // namespace Internal } // namespace Beautifier diff --git a/src/plugins/beautifier/clangformat/clangformatsettings.h b/src/plugins/beautifier/clangformat/clangformatsettings.h index 4fca7ddc248..079a6438655 100644 --- a/src/plugins/beautifier/clangformat/clangformatsettings.h +++ b/src/plugins/beautifier/clangformat/clangformatsettings.h @@ -29,7 +29,6 @@ namespace Beautifier { namespace Internal { -namespace ClangFormat { class ClangFormatSettings : public AbstractSettings { @@ -63,6 +62,5 @@ private: void readStyles() override; }; -} // namespace ClangFormat } // namespace Internal } // namespace Beautifier diff --git a/src/plugins/beautifier/uncrustify/uncrustify.cpp b/src/plugins/beautifier/uncrustify/uncrustify.cpp index c8069a9df96..689ef3714a0 100644 --- a/src/plugins/beautifier/uncrustify/uncrustify.cpp +++ b/src/plugins/beautifier/uncrustify/uncrustify.cpp @@ -54,23 +54,20 @@ using namespace TextEditor; namespace Beautifier { namespace Internal { -namespace Uncrustify { Uncrustify::Uncrustify() { - Core::ActionContainer *menu = Core::ActionManager::createMenu(Constants::Uncrustify::MENU_ID); + Core::ActionContainer *menu = Core::ActionManager::createMenu("Uncrustify.Menu"); menu->menu()->setTitle(tr("&Uncrustify")); m_formatFile = new QAction(BeautifierPlugin::msgFormatCurrentFile(), this); Core::Command *cmd - = Core::ActionManager::registerAction(m_formatFile, - Constants::Uncrustify::ACTION_FORMATFILE); + = Core::ActionManager::registerAction(m_formatFile, "Uncrustify.FormatFile"); menu->addAction(cmd); connect(m_formatFile, &QAction::triggered, this, &Uncrustify::formatFile); m_formatRange = new QAction(BeautifierPlugin::msgFormatSelectedText(), this); - cmd = Core::ActionManager::registerAction(m_formatRange, - Constants::Uncrustify::ACTION_FORMATSELECTED); + cmd = Core::ActionManager::registerAction(m_formatRange, "Uncrustify.FormatSelectedText"); menu->addAction(cmd); connect(m_formatRange, &QAction::triggered, this, &Uncrustify::formatSelectedText); @@ -82,7 +79,7 @@ Uncrustify::Uncrustify() QString Uncrustify::id() const { - return QLatin1String(Constants::Uncrustify::DISPLAY_NAME); + return QLatin1String(Constants::UNCRUSTIFY_DISPLAY_NAME); } void Uncrustify::updateActions(Core::IEditor *editor) @@ -97,7 +94,7 @@ void Uncrustify::formatFile() const QString cfgFileName = configurationFile(); if (cfgFileName.isEmpty()) { BeautifierPlugin::showError(BeautifierPlugin::msgCannotGetConfigurationFile( - tr(Constants::Uncrustify::DISPLAY_NAME))); + tr(Constants::UNCRUSTIFY_DISPLAY_NAME))); } else { formatCurrentFile(command(cfgFileName)); } @@ -108,7 +105,7 @@ void Uncrustify::formatSelectedText() const QString cfgFileName = configurationFile(); if (cfgFileName.isEmpty()) { BeautifierPlugin::showError(BeautifierPlugin::msgCannotGetConfigurationFile( - tr(Constants::Uncrustify::DISPLAY_NAME))); + tr(Constants::UNCRUSTIFY_DISPLAY_NAME))); return; } @@ -199,6 +196,5 @@ Command Uncrustify::command(const QString &cfgFile, bool fragment) const return command; } -} // namespace Uncrustify } // namespace Internal } // namespace Beautifier diff --git a/src/plugins/beautifier/uncrustify/uncrustify.h b/src/plugins/beautifier/uncrustify/uncrustify.h index a25d288d8c8..4b97838a8a2 100644 --- a/src/plugins/beautifier/uncrustify/uncrustify.h +++ b/src/plugins/beautifier/uncrustify/uncrustify.h @@ -32,7 +32,6 @@ namespace Beautifier { namespace Internal { -namespace Uncrustify { class Uncrustify : public BeautifierAbstractTool { @@ -58,6 +57,5 @@ private: UncrustifyOptionsPage m_page{&m_settings}; }; -} // namespace Uncrustify } // namespace Internal } // namespace Beautifier diff --git a/src/plugins/beautifier/uncrustify/uncrustifyconstants.h b/src/plugins/beautifier/uncrustify/uncrustifyconstants.h index 7fa9537c578..131f798a05a 100644 --- a/src/plugins/beautifier/uncrustify/uncrustifyconstants.h +++ b/src/plugins/beautifier/uncrustify/uncrustifyconstants.h @@ -29,15 +29,8 @@ namespace Beautifier { namespace Constants { -namespace Uncrustify { -const char DISPLAY_NAME[] = QT_TRANSLATE_NOOP("Beautifier::Internal::Uncrustify::Uncrustify", "Uncrustify"); -const char ACTION_FORMATFILE[] = "Uncrustify.FormatFile"; -const char ACTION_FORMATSELECTED[] = "Uncrustify.FormatSelectedText"; -const char MENU_ID[] = "Uncrustify.Menu"; -const char OPTION_ID[] = "Uncrustify"; -const char SETTINGS_NAME[] = "uncrustify"; +const char UNCRUSTIFY_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("Beautifier::Internal", "Uncrustify"); -} // namespace Uncrustify } // namespace Constants } // namespace Beautifier diff --git a/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp b/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp index 10dd6377d8c..2a934581089 100644 --- a/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp +++ b/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp @@ -35,7 +35,6 @@ namespace Beautifier { namespace Internal { -namespace Uncrustify { class UncrustifyOptionsPageWidget : public Core::IOptionsPageWidget { @@ -63,7 +62,7 @@ UncrustifyOptionsPageWidget::UncrustifyOptionsPageWidget(UncrustifySettings *set ui.command->setExpectedKind(Utils::PathChooser::ExistingCommand); ui.command->setCommandVersionArguments({"--version"}); ui.command->setPromptDialogTitle(BeautifierPlugin::msgCommandPromptDialogTitle( - Uncrustify::tr(Constants::Uncrustify::DISPLAY_NAME))); + Uncrustify::tr(Constants::UNCRUSTIFY_DISPLAY_NAME))); connect(ui.command, &Utils::PathChooser::validChanged, ui.options, &QWidget::setEnabled); ui.configurations->setSettings(m_settings); @@ -97,12 +96,11 @@ void UncrustifyOptionsPageWidget::apply() UncrustifyOptionsPage::UncrustifyOptionsPage(UncrustifySettings *settings) { - setId(Constants::Uncrustify::OPTION_ID); + setId("Uncrustify"); setDisplayName(UncrustifyOptionsPageWidget::tr("Uncrustify")); setCategory(Constants::OPTION_CATEGORY); setWidgetCreator([settings] { return new UncrustifyOptionsPageWidget(settings); }); } -} // namespace Uncrustify } // namespace Internal } // namespace Beautifier diff --git a/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.h b/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.h index 04312b241d3..37802b655e8 100644 --- a/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.h +++ b/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.h @@ -29,7 +29,6 @@ namespace Beautifier { namespace Internal { -namespace Uncrustify { class UncrustifySettings; @@ -39,6 +38,5 @@ public: explicit UncrustifyOptionsPage(UncrustifySettings *settings); }; -} // namespace Uncrustify } // namespace Internal } // namespace Beautifier diff --git a/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.ui b/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.ui index 690044bc504..67a59edfa20 100644 --- a/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.ui +++ b/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>Beautifier::Internal::Uncrustify::UncrustifyOptionsPage</class> - <widget class="QWidget" name="Beautifier::Internal::Uncrustify::UncrustifyOptionsPage"> + <class>Beautifier::Internal::UncrustifyOptionsPage</class> + <widget class="QWidget" name="Beautifier::Internal::UncrustifyOptionsPage"> <property name="geometry"> <rect> <x>0</x> diff --git a/src/plugins/beautifier/uncrustify/uncrustifysettings.cpp b/src/plugins/beautifier/uncrustify/uncrustifysettings.cpp index d92c64a80de..6f94d5e49f4 100644 --- a/src/plugins/beautifier/uncrustify/uncrustifysettings.cpp +++ b/src/plugins/beautifier/uncrustify/uncrustifysettings.cpp @@ -41,9 +41,7 @@ namespace Beautifier { namespace Internal { -namespace Uncrustify { -namespace { const char USE_OTHER_FILES[] = "useOtherFiles"; const char USE_HOME_FILE[] = "useHomeFile"; const char USE_SPECIFIC_CONFIG_FILE_PATH[] = "useSpecificConfigFile"; @@ -51,10 +49,10 @@ const char SPECIFIC_CONFIG_FILE_PATH[] = "specificConfigFile"; const char USE_CUSTOM_STYLE[] = "useCustomStyle"; const char CUSTOM_STYLE[] = "customStyle"; const char FORMAT_ENTIRE_FILE_FALLBACK[] = "formatEntireFileFallback"; -} +const char SETTINGS_NAME[] = "uncrustify"; UncrustifySettings::UncrustifySettings() : - AbstractSettings(Constants::Uncrustify::SETTINGS_NAME, ".cfg") + AbstractSettings(SETTINGS_NAME, ".cfg") { connect(&m_versionProcess, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), this, &UncrustifySettings::parseVersionProcessResult); @@ -144,7 +142,7 @@ QString UncrustifySettings::documentationFilePath() const { return Core::ICore::userResourcePath() + '/' + Beautifier::Constants::SETTINGS_DIRNAME + '/' + Beautifier::Constants::DOCUMENTATION_DIRNAME + '/' - + Constants::Uncrustify::SETTINGS_NAME + ".xml"; + + SETTINGS_NAME + ".xml"; } void UncrustifySettings::createDocumentationFile() const @@ -243,6 +241,5 @@ void UncrustifySettings::parseVersionProcessResult(int exitCode, QProcess::ExitS parseVersion(QString::fromUtf8(m_versionProcess.readAllStandardError()), m_version); } -} // namespace Uncrustify } // namespace Internal } // namespace Beautifier diff --git a/src/plugins/beautifier/uncrustify/uncrustifysettings.h b/src/plugins/beautifier/uncrustify/uncrustifysettings.h index 07798ef1e13..23f9bd7ae79 100644 --- a/src/plugins/beautifier/uncrustify/uncrustifysettings.h +++ b/src/plugins/beautifier/uncrustify/uncrustifysettings.h @@ -31,7 +31,6 @@ namespace Beautifier { namespace Internal { -namespace Uncrustify { class UncrustifySettings : public AbstractSettings { @@ -71,6 +70,5 @@ private: void parseVersionProcessResult(int exitCode, QProcess::ExitStatus exitStatus); }; -} // namespace Uncrustify } // namespace Internal } // namespace Beautifier |