diff --git a/src/plugins/beautifier/artisticstyle/artisticstyle.cpp b/src/plugins/beautifier/artisticstyle/artisticstyle.cpp index 89699253a6a..36d6280ea9c 100644 --- a/src/plugins/beautifier/artisticstyle/artisticstyle.cpp +++ b/src/plugins/beautifier/artisticstyle/artisticstyle.cpp @@ -50,7 +50,7 @@ namespace Beautifier::Internal { // Settings -static QString displayName() { return Tr::tr("Artistic Style"); } +static QString asDisplayName() { return Tr::tr("Artistic Style"); } const char SETTINGS_NAME[] = "artisticstyle"; @@ -63,7 +63,7 @@ public: setVersionRegExp(QRegularExpression("([2-9]{1})\\.([0-9]{1,2})(\\.[1-9]{1})?$")); command.setLabelText(Tr::tr("Artistic Style command:")); command.setDefaultValue("astyle"); - command.setPromptDialogTitle(BeautifierTool::msgCommandPromptDialogTitle(displayName())); + command.setPromptDialogTitle(BeautifierTool::msgCommandPromptDialogTitle(asDisplayName())); useOtherFiles.setSettingsKey("useOtherFiles"); useOtherFiles.setLabelText(Tr::tr("Use file *.astylerc defined in project files")); @@ -238,7 +238,7 @@ public: ArtisticStyleOptionsPage() { setId("ArtisticStyle"); - setDisplayName(displayName()); + setDisplayName(asDisplayName()); setCategory(Constants::OPTION_CATEGORY); setWidgetCreator([] { return new ArtisticStyleOptionsPageWidget; }); } @@ -278,7 +278,7 @@ void ArtisticStyle::formatFile() { const QString cfgFileName = configurationFile(); if (cfgFileName.isEmpty()) - showError(msgCannotGetConfigurationFile(displayName())); + showError(BeautifierTool::msgCannotGetConfigurationFile(asDisplayName())); else formatCurrentFile(command(cfgFileName)); } diff --git a/src/plugins/beautifier/uncrustify/uncrustify.cpp b/src/plugins/beautifier/uncrustify/uncrustify.cpp index 553f3875001..eae39aad591 100644 --- a/src/plugins/beautifier/uncrustify/uncrustify.cpp +++ b/src/plugins/beautifier/uncrustify/uncrustify.cpp @@ -51,7 +51,7 @@ namespace Beautifier::Internal { const char SETTINGS_NAME[] = "uncrustify"; -static QString displayName() { return Tr::tr("Uncrustify"); } +static QString uDisplayName() { return Tr::tr("Uncrustify"); } class UncrustifySettings : public AbstractSettings { @@ -63,7 +63,7 @@ public: command.setDefaultValue("uncrustify"); command.setLabelText(Tr::tr("Uncrustify command:")); - command.setPromptDialogTitle(BeautifierTool::msgCommandPromptDialogTitle(displayName())); + command.setPromptDialogTitle(BeautifierTool::msgCommandPromptDialogTitle(uDisplayName())); useOtherFiles.setSettingsKey("useOtherFiles"); useOtherFiles.setDefaultValue(true); @@ -233,7 +233,7 @@ public: UncrustifyOptionsPage() { setId("Uncrustify"); - setDisplayName(Tr::tr("Uncrustify")); + setDisplayName(uDisplayName()); setCategory(Constants::OPTION_CATEGORY); setWidgetCreator([] { return new UncrustifyOptionsPageWidget; }); } @@ -282,7 +282,7 @@ void Uncrustify::formatFile() { const FilePath cfgFileName = configurationFile(); if (cfgFileName.isEmpty()) - showError(msgCannotGetConfigurationFile(displayName())); + showError(msgCannotGetConfigurationFile(uDisplayName())); else formatCurrentFile(command(cfgFileName)); } @@ -291,7 +291,7 @@ void Uncrustify::formatSelectedText() { const FilePath cfgFileName = configurationFile(); if (cfgFileName.isEmpty()) { - showError(msgCannotGetConfigurationFile(displayName())); + showError(msgCannotGetConfigurationFile(uDisplayName())); return; }