From 73ec0c5db4f2aa2d084b8ecc8d63656371e8e23a Mon Sep 17 00:00:00 2001 From: Lorenz Haas Date: Wed, 5 Mar 2014 22:25:48 +0100 Subject: [PATCH] Beautifier: Add constant for a tool's display name Change-Id: I9cc50ad06d7515f5fc82394cbfb71e7327e7d9e1 Reviewed-by: Friedemann Kleint Reviewed-by: David Schulz --- src/plugins/beautifier/artisticstyle/artisticstyle.cpp | 4 ++-- .../beautifier/artisticstyle/artisticstyleconstants.h | 1 + .../beautifier/artisticstyle/artisticstyleoptionspage.cpp | 4 ++-- src/plugins/beautifier/uncrustify/uncrustify.cpp | 6 +++--- src/plugins/beautifier/uncrustify/uncrustifyconstants.h | 1 + src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp | 4 ++-- 6 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/plugins/beautifier/artisticstyle/artisticstyle.cpp b/src/plugins/beautifier/artisticstyle/artisticstyle.cpp index 30a39d0d7fc..1277fbf0242 100644 --- a/src/plugins/beautifier/artisticstyle/artisticstyle.cpp +++ b/src/plugins/beautifier/artisticstyle/artisticstyle.cpp @@ -69,7 +69,7 @@ ArtisticStyle::~ArtisticStyle() bool ArtisticStyle::initialize() { Core::ActionContainer *menu = Core::ActionManager::createMenu(Constants::ArtisticStyle::MENU_ID); - menu->menu()->setTitle(QLatin1String("Artistic Style")); + menu->menu()->setTitle(QLatin1String(Constants::ArtisticStyle::DISPLAY_NAME)); m_formatFile = new QAction(BeautifierPlugin::msgFormatCurrentFile(), this); Core::Command *cmd @@ -132,7 +132,7 @@ void ArtisticStyle::formatFile() if (cfgFileName.isEmpty()) { BeautifierPlugin::showError(BeautifierPlugin::msgCannotGetConfigurationFile( - QLatin1String("Artistic Style"))); + QLatin1String(Constants::ArtisticStyle::DISPLAY_NAME))); } else { BeautifierPlugin::formatCurrentFile(QStringList() << m_settings->command() diff --git a/src/plugins/beautifier/artisticstyle/artisticstyleconstants.h b/src/plugins/beautifier/artisticstyle/artisticstyleconstants.h index 433271f3fb1..31cd8d69b97 100644 --- a/src/plugins/beautifier/artisticstyle/artisticstyleconstants.h +++ b/src/plugins/beautifier/artisticstyle/artisticstyleconstants.h @@ -34,6 +34,7 @@ namespace Beautifier { namespace Constants { namespace ArtisticStyle { +const char DISPLAY_NAME[] = "Artistic Style"; const char ACTION_FORMATFILE[] = "ArtisticStyle.FormatFile"; const char MENU_ID[] = "ArtisticStyle.Menu"; const char OPTION_ID[] = "ArtisticStyle"; diff --git a/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.cpp b/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.cpp index 2f0c82f2405..f6019fd59fb 100644 --- a/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.cpp +++ b/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.cpp @@ -52,8 +52,8 @@ ArtisticStyleOptionsPageWidget::ArtisticStyleOptionsPageWidget(ArtisticStyleSett { ui->setupUi(this); ui->command->setExpectedKind(Utils::PathChooser::ExistingCommand); - ui->command->setPromptDialogTitle( - BeautifierPlugin::msgCommandPromptDialogTitle(QLatin1String("Artistic Style"))); + ui->command->setPromptDialogTitle(BeautifierPlugin::msgCommandPromptDialogTitle( + QLatin1String(Constants::ArtisticStyle::DISPLAY_NAME))); connect(ui->command, SIGNAL(validChanged(bool)), ui->options, SLOT(setEnabled(bool))); ui->configurations->setSettings(m_settings); } diff --git a/src/plugins/beautifier/uncrustify/uncrustify.cpp b/src/plugins/beautifier/uncrustify/uncrustify.cpp index f0692571744..5d1e073ed53 100644 --- a/src/plugins/beautifier/uncrustify/uncrustify.cpp +++ b/src/plugins/beautifier/uncrustify/uncrustify.cpp @@ -69,7 +69,7 @@ Uncrustify::~Uncrustify() bool Uncrustify::initialize() { Core::ActionContainer *menu = Core::ActionManager::createMenu(Constants::Uncrustify::MENU_ID); - menu->menu()->setTitle(QLatin1String("Uncrustify")); + menu->menu()->setTitle(QLatin1String(Constants::Uncrustify::DISPLAY_NAME)); m_formatFile = new QAction(BeautifierPlugin::msgFormatCurrentFile(), this); Core::Command *cmd @@ -126,8 +126,8 @@ void Uncrustify::formatFile() cfgFileName = m_settings->styleFileName(m_settings->customStyle()); if (cfgFileName.isEmpty()) { - BeautifierPlugin::showError( - BeautifierPlugin::msgCannotGetConfigurationFile(QLatin1String("uncrustify"))); + BeautifierPlugin::showError(BeautifierPlugin::msgCannotGetConfigurationFile( + QLatin1String(Constants::Uncrustify::DISPLAY_NAME))); } else { BeautifierPlugin::formatCurrentFile(QStringList() << m_settings->command() diff --git a/src/plugins/beautifier/uncrustify/uncrustifyconstants.h b/src/plugins/beautifier/uncrustify/uncrustifyconstants.h index 6a09f2138ff..c75f0acd4dc 100644 --- a/src/plugins/beautifier/uncrustify/uncrustifyconstants.h +++ b/src/plugins/beautifier/uncrustify/uncrustifyconstants.h @@ -34,6 +34,7 @@ namespace Beautifier { namespace Constants { namespace Uncrustify { +const char DISPLAY_NAME[] = "Uncrustify"; const char ACTION_FORMATFILE[] = "Uncrustify.FormatFile"; const char MENU_ID[] = "Uncrustify.Menu"; const char OPTION_ID[] = "Uncrustify"; diff --git a/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp b/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp index 9c04e164484..64afa33dcca 100644 --- a/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp +++ b/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp @@ -52,8 +52,8 @@ UncrustifyOptionsPageWidget::UncrustifyOptionsPageWidget(UncrustifySettings *set { ui->setupUi(this); ui->command->setExpectedKind(Utils::PathChooser::ExistingCommand); - ui->command->setPromptDialogTitle( - BeautifierPlugin::msgCommandPromptDialogTitle(QLatin1String("Uncrustify"))); + ui->command->setPromptDialogTitle(BeautifierPlugin::msgCommandPromptDialogTitle( + QLatin1String(Constants::Uncrustify::DISPLAY_NAME))); connect(ui->command, SIGNAL(validChanged(bool)), ui->options, SLOT(setEnabled(bool))); ui->configurations->setSettings(m_settings); }