From 6309a3c8d72977156c5699d1b51ea4ba76c3cb2e Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Mon, 7 Oct 2024 12:05:15 +0200
Subject: [PATCH] ClangFormat: Fix terminology

It is either `ClangFormat` (the product) or `clang-format` (the
executable).

Change-Id: I018abd8c6f3d33a7d93259f79ce09174e451a5df
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
---
 share/qtcreator/translations/qtcreator_de.ts           |  8 ++++----
 share/qtcreator/translations/qtcreator_fr.ts           |  8 ++++----
 src/plugins/beautifier/beautifiertool.cpp              |  2 +-
 src/plugins/beautifier/clangformat/clangformat.cpp     |  6 +++---
 .../clangformat/clangformatglobalconfigwidget.cpp      | 10 ++++++----
 5 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts
index f645ae120b9..8bc892f3070 100644
--- a/share/qtcreator/translations/qtcreator_de.ts
+++ b/share/qtcreator/translations/qtcreator_de.ts
@@ -15239,12 +15239,12 @@ Zum Beispiel bewirkt die Angabe &quot;Revision: 15&quot; dass der Branch auf Rev
         <translation>Fallback-Stil:</translation>
     </message>
     <message>
-        <source>Clang Format command:</source>
-        <translation>Ausführbare Datei von Clang Format:</translation>
+        <source>ClangFormat command:</source>
+        <translation>Ausführbare Datei von ClangFormat:</translation>
     </message>
     <message>
-        <source>Clang Format</source>
-        <translation>Clang Format</translation>
+        <source>ClangFormat</source>
+        <translation>ClangFormat</translation>
     </message>
     <message>
         <source>Use file uncrustify.cfg defined in project files</source>
diff --git a/share/qtcreator/translations/qtcreator_fr.ts b/share/qtcreator/translations/qtcreator_fr.ts
index 7b728df9070..6014cf39f1d 100644
--- a/share/qtcreator/translations/qtcreator_fr.ts
+++ b/share/qtcreator/translations/qtcreator_fr.ts
@@ -15352,12 +15352,12 @@ Par exemple, «&#xa0;Revision&#xa0;: 15&#xa0;» laissera la branche à la révis
         <translation>Style de repli :</translation>
     </message>
     <message>
-        <source>Clang Format command:</source>
-        <translation>Commande de Clang Format :</translation>
+        <source>ClangFormat command:</source>
+        <translation>Commande de ClangFormat :</translation>
     </message>
     <message>
-        <source>Clang Format</source>
-        <translation>Clang Format</translation>
+        <source>ClangFormat</source>
+        <translation>ClangFormat</translation>
     </message>
     <message>
         <source>No description available.</source>
diff --git a/src/plugins/beautifier/beautifiertool.cpp b/src/plugins/beautifier/beautifiertool.cpp
index 2914b5c58c0..9e55cf18363 100644
--- a/src/plugins/beautifier/beautifiertool.cpp
+++ b/src/plugins/beautifier/beautifiertool.cpp
@@ -150,7 +150,7 @@ AbstractSettings::AbstractSettings(const QString &name, const QString &ending)
     command.setSettingsKey("command");
     command.setExpectedKind(PathChooser::ExistingCommand);
     command.setCommandVersionArguments({"--version"});
-    command.setPromptDialogTitle(BeautifierTool::msgCommandPromptDialogTitle("Clang Format"));
+    command.setPromptDialogTitle(BeautifierTool::msgCommandPromptDialogTitle("ClangFormat"));
     command.setValidatePlaceHolder(true);
     command.addOnChanged(this, [this] { m_version = {}; version(); });
 
diff --git a/src/plugins/beautifier/clangformat/clangformat.cpp b/src/plugins/beautifier/clangformat/clangformat.cpp
index 14c7313503f..7a250d6b94a 100644
--- a/src/plugins/beautifier/clangformat/clangformat.cpp
+++ b/src/plugins/beautifier/clangformat/clangformat.cpp
@@ -54,8 +54,8 @@ public:
         : AbstractSettings(SETTINGS_NAME, ".clang-format")
     {
         command.setDefaultValue("clang-format");
-        command.setPromptDialogTitle(BeautifierTool::msgCommandPromptDialogTitle("Clang Format"));
-        command.setLabelText(Tr::tr("Clang Format command:"));
+        command.setPromptDialogTitle(BeautifierTool::msgCommandPromptDialogTitle("ClangFormat"));
+        command.setLabelText(Tr::tr("ClangFormat command:"));
 
         usePredefinedStyle.setSettingsKey("usePredefinedStyle");
         usePredefinedStyle.setDefaultValue(true);
@@ -530,7 +530,7 @@ public:
     ClangFormatSettingsPage()
     {
         setId("ClangFormat");
-        setDisplayName(Tr::tr("Clang Format"));
+        setDisplayName(Tr::tr("ClangFormat"));
         setCategory(Constants::OPTION_CATEGORY);
         setWidgetCreator([] { return new ClangFormatSettingsPageWidget; });
     }
diff --git a/src/plugins/clangformat/clangformatglobalconfigwidget.cpp b/src/plugins/clangformat/clangformatglobalconfigwidget.cpp
index 7134ecd2e37..86bca4e40d4 100644
--- a/src/plugins/clangformat/clangformatglobalconfigwidget.cpp
+++ b/src/plugins/clangformat/clangformatglobalconfigwidget.cpp
@@ -375,9 +375,11 @@ public:
 private:
     void slotImportClicked() final
     {
-        const FilePath filePath =
-            FileUtils::getOpenFilePath(this, Tr::tr("Import Code Format"), {},
-                                       Tr::tr("Clang Format (*clang-format*);;All files (*)"));
+        const FilePath filePath = FileUtils::getOpenFilePath(
+            this,
+            Tr::tr("Import Code Format"),
+            {},
+            Tr::tr("ClangFormat (*clang-format*);;All files (*)"));
         if (!filePath.isEmpty()) {
             QString name = QInputDialog::getText(
                 this,
@@ -407,7 +409,7 @@ private:
             this,
             Tr::tr("Export Code Format"),
             FileUtils::homePath(),
-            Tr::tr("Clang Format (*clang-format*);;All files (*)"));
+            Tr::tr("ClangFormat (*clang-format*);;All files (*)"));
         if (!filePath.isEmpty()) {
             FilePath clangFormatFile = filePathToCurrentSettings(currentPreferences);
             clangFormatFile.copyFile(filePath);