From 4f55dbdd386af0569420aef4c9b6b4277632bcbd Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@qt.io>
Date: Wed, 8 Feb 2023 14:30:01 +0100
Subject: [PATCH] CompilationDatabaseProjectManager: Tr::tr()

Change-Id: I5a4b05ce3eab90cfe05c297fa3971f94270ec474
Reviewed-by: hjk <hjk@qt.io>
---
 share/qtcreator/translations/qtcreator_de.ts                 | 4 ++--
 share/qtcreator/translations/qtcreator_ru.ts                 | 5 +----
 share/qtcreator/translations/qtcreator_zh_CN.ts              | 5 +----
 .../compilationdatabaseproject.cpp                           | 2 +-
 .../compilationdatabaseprojectmanagerplugin.cpp              | 3 ++-
 .../compilationdbparser.cpp                                  | 5 +++--
 6 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts
index ca002fbf759..6a0b9a47275 100644
--- a/share/qtcreator/translations/qtcreator_de.ts
+++ b/share/qtcreator/translations/qtcreator_de.ts
@@ -44442,7 +44442,7 @@ Doppelklicken Sie einen Eintrag um ihn zu ändern.</translation>
     </message>
 </context>
 <context>
-    <name>CompilationDatabaseProjectManager::Internal::CompilationDbParser</name>
+    <name>::CompilationDatabaseProjectManager</name>
     <message>
         <source>Scan &quot;%1&quot; project tree</source>
         <translation>Durchsuche &quot;%1&quot;-Projektbaum</translation>
@@ -50751,7 +50751,7 @@ in &quot;%2&quot; aus.
     </message>
 </context>
 <context>
-    <name>CompilationDatabaseProjectManager::Internal::CompilationDatabaseProjectManagerPlugin</name>
+    <name>::CompilationDatabaseProjectManager</name>
     <message>
         <source>Change Root Directory</source>
         <translation type="unfinished"></translation>
diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts
index 62abd7775ee..faf6b5d7dfc 100644
--- a/share/qtcreator/translations/qtcreator_ru.ts
+++ b/share/qtcreator/translations/qtcreator_ru.ts
@@ -7876,14 +7876,11 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>CompilationDatabaseProjectManager::Internal::CompilationDatabaseProjectManagerPlugin</name>
+    <name>::CompilationDatabaseProjectManager</name>
     <message>
         <source>Change Root Directory</source>
         <translation>Сменить корневой каталог</translation>
     </message>
-</context>
-<context>
-    <name>CompilationDatabaseProjectManager::Internal::CompilationDbParser</name>
     <message>
         <source>Scan &quot;%1&quot; project tree</source>
         <translation>Сканирование дерева проекта «%1»</translation>
diff --git a/share/qtcreator/translations/qtcreator_zh_CN.ts b/share/qtcreator/translations/qtcreator_zh_CN.ts
index 925e9667a67..9b94b3bf048 100644
--- a/share/qtcreator/translations/qtcreator_zh_CN.ts
+++ b/share/qtcreator/translations/qtcreator_zh_CN.ts
@@ -8339,14 +8339,11 @@ Set a valid executable first.</source>
     </message>
 </context>
 <context>
-    <name>CompilationDatabaseProjectManager::Internal::CompilationDatabaseProjectManagerPlugin</name>
+    <name>::CompilationDatabaseProjectManager</name>
     <message>
         <source>Change Root Directory</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>CompilationDatabaseProjectManager::Internal::CompilationDbParser</name>
     <message>
         <source>Scan &quot;%1&quot; project tree</source>
         <translation type="unfinished"></translation>
diff --git a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp
index 5f23238d7b8..3085a011ff4 100644
--- a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp
+++ b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp
@@ -512,7 +512,7 @@ CompilationDatabaseBuildConfigurationFactory::CompilationDatabaseBuildConfigurat
     setSupportedProjectMimeTypeName(Constants::COMPILATIONDATABASEMIMETYPE);
 
     setBuildGenerator([](const Kit *, const FilePath &projectPath, bool) {
-        const QString name = BuildConfiguration::tr("Release");
+        const QString name = QCoreApplication::translate("::ProjectExplorer", "Release");
         ProjectExplorer::BuildInfo info;
         info.typeName = name;
         info.displayName = name;
diff --git a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseprojectmanagerplugin.cpp b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseprojectmanagerplugin.cpp
index 7f220244b0f..5cb9c75d8f2 100644
--- a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseprojectmanagerplugin.cpp
+++ b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseprojectmanagerplugin.cpp
@@ -5,6 +5,7 @@
 
 #include "compilationdatabaseconstants.h"
 #include "compilationdatabaseproject.h"
+#include "compilationdatabaseprojectmanagertr.h"
 #include "compilationdatabasetests.h"
 
 #include <coreplugin/actionmanager/actioncontainer.h>
@@ -34,7 +35,7 @@ class CompilationDatabaseProjectManagerPluginPrivate
 public:
     CompilationDatabaseEditorFactory editorFactory;
     CompilationDatabaseBuildConfigurationFactory buildConfigFactory;
-    QAction changeRootAction{CompilationDatabaseProjectManagerPlugin::tr("Change Root Directory")};
+    QAction changeRootAction{Tr::tr("Change Root Directory")};
 };
 
 CompilationDatabaseProjectManagerPlugin::~CompilationDatabaseProjectManagerPlugin()
diff --git a/src/plugins/compilationdatabaseprojectmanager/compilationdbparser.cpp b/src/plugins/compilationdatabaseprojectmanager/compilationdbparser.cpp
index bf5ff01e2ae..27c7477abc9 100644
--- a/src/plugins/compilationdatabaseprojectmanager/compilationdbparser.cpp
+++ b/src/plugins/compilationdatabaseprojectmanager/compilationdbparser.cpp
@@ -4,6 +4,7 @@
 #include "compilationdbparser.h"
 
 #include "compilationdatabaseconstants.h"
+#include "compilationdatabaseprojectmanagertr.h"
 
 #include <coreplugin/progressmanager/progressmanager.h>
 #include <projectexplorer/task.h>
@@ -87,7 +88,7 @@ void CompilationDbParser::start()
         });
         m_treeScanner->asyncScanForFiles(m_rootPath);
         Core::ProgressManager::addTask(m_treeScanner->future(),
-                                       tr("Scan \"%1\" project tree").arg(m_projectName),
+                                       Tr::tr("Scan \"%1\" project tree").arg(m_projectName),
                                        "CompilationDatabase.Scan.Tree");
         ++m_runningParserJobs;
         connect(m_treeScanner, &TreeScanner::finished,
@@ -97,7 +98,7 @@ void CompilationDbParser::start()
     // Thread 2: Parse the project file.
     const QFuture<DbContents> future = runAsync(&CompilationDbParser::parseProject, this);
     Core::ProgressManager::addTask(future,
-                                   tr("Parse \"%1\" project").arg(m_projectName),
+                                   Tr::tr("Parse \"%1\" project").arg(m_projectName),
                                    "CompilationDatabase.Parse");
     ++m_runningParserJobs;
     m_parserWatcher.setFuture(future);