Translations: Remove header includes of *tr.h in .h files

The wrong Tr::tr could be executed by code indirectly including a *tr.h
file from another module.
To Translate in a header file, use QCoreApplication::tr().

Change-Id: I30e67245991d2c2f0eeb01ab356555bdb9841af0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

17 files changed, 45 insertions, 31 deletions

diff --git a/src/libs/languageserverprotocol/jsonrpcmessages.h b/src/libs/languageserverprotocol/jsonrpcmessages.h
index c53ab45d0f..705e57d2eb 100644
--- a/src/libs/languageserverprotocol/jsonrpcmessages.h
+++ b/src/libs/languageserverprotocol/jsonrpcmessages.h
@@ -5,7 +5,6 @@
 
 #include "basemessage.h"
 #include "jsonkeys.h"
-#include "languageserverprotocoltr.h"
 #include "lsptypes.h"
 
 #include <utils/qtcassert.h>
@@ -163,7 +162,8 @@ public:
         if (auto parameter = params())
             return parameter->isValid();
         if (errorMessage)
-            *errorMessage = Tr::tr("No parameters in \"%1\".").arg(method());
+            *errorMessage = QCoreApplication::tr("::LanguageServerProtocol",
+                                                 "No parameters in \"%1\".").arg(method());
         return false;
     }
 };
@@ -375,7 +375,8 @@ public:
         if (id().isValid())
             return true;
         if (errorMessage)
-            *errorMessage = Tr::tr("No ID set in \"%1\".").arg(this->method());
+            *errorMessage = QCoreApplication::tr("::LanguageServerProtocol",
+                                                 "No ID set in \"%1\".").arg(this->method());
         return false;
     }
 
diff --git a/src/libs/utils/aspects.cpp b/src/libs/utils/aspects.cpp
index 2141efa867..8e55046c0c 100644
--- a/src/libs/utils/aspects.cpp
+++ b/src/libs/utils/aspects.cpp
@@ -10,6 +10,7 @@
 #include "pathchooser.h"
 #include "qtcassert.h"
 #include "qtcsettings.h"
+#include "utilstr.h"
 #include "variablechooser.h"
 
 #include <QAction>
diff --git a/src/libs/utils/aspects.h b/src/libs/utils/aspects.h
index 9b5bf45ab4..81a7316681 100644
--- a/src/libs/utils/aspects.h
+++ b/src/libs/utils/aspects.h
@@ -8,7 +8,8 @@
 #include "infolabel.h"
 #include "macroexpander.h"
 #include "pathchooser.h"
-#include "utilstr.h"
+
+#include <QCoreApplication>
 
 #include <functional>
 #include <memory>
@@ -500,9 +501,9 @@ class QTCREATOR_UTILS_EXPORT TriStateAspect : public SelectionAspect
     Q_OBJECT
 public:
     TriStateAspect(
-            const QString onString = Tr::tr("Enable"),
-            const QString &offString = Tr::tr("Disable"),
-            const QString &defaultString = Tr::tr("Leave at Default"));
+            const QString onString = QCoreApplication::tr("::Utils", "Enable"),
+            const QString &offString = QCoreApplication::tr("::Utils", "Disable"),
+            const QString &defaultString = QCoreApplication::tr("::Utils", "Leave at Default"));
 
     TriState value() const;
     void setValue(TriState setting);
diff --git a/src/plugins/autotest/testrunconfiguration.h b/src/plugins/autotest/testrunconfiguration.h
index 3e905c01c0..867413aeae 100644
--- a/src/plugins/autotest/testrunconfiguration.h
+++ b/src/plugins/autotest/testrunconfiguration.h
@@ -5,8 +5,6 @@
 
 #include "testconfiguration.h"
 
-#include "autotesttr.h"
-
 #include <debugger/debuggerrunconfigurationaspect.h>
 
 #include <projectexplorer/devicesupport/devicemanager.h>
@@ -16,6 +14,8 @@
 
 #include <utils/qtcassert.h>
 
+#include <QCoreApplication>
+
 namespace Autotest {
 namespace Internal {
 
@@ -25,7 +25,7 @@ public:
     TestRunConfiguration(ProjectExplorer::Target *parent, TestConfiguration *config)
         : ProjectExplorer::RunConfiguration(parent, "AutoTest.TestRunConfig")
     {
-        setDefaultDisplayName(Tr::tr("AutoTest Debug"));
+        setDefaultDisplayName(QCoreApplication::tr("::Autotest", "AutoTest Debug"));
 
         bool enableQuick = false;
         if (auto debuggable = dynamic_cast<DebuggableTestConfiguration *>(config))
diff --git a/src/plugins/ctfvisualizer/ctfvisualizertool.cpp b/src/plugins/ctfvisualizer/ctfvisualizertool.cpp
index 606eaa2d76..0fbc5cac65 100644
--- a/src/plugins/ctfvisualizer/ctfvisualizertool.cpp
+++ b/src/plugins/ctfvisualizer/ctfvisualizertool.cpp
@@ -7,6 +7,7 @@
 #include "ctfstatisticsmodel.h"
 #include "ctfstatisticsview.h"
 #include "ctftimelinemodel.h"
+#include "ctfvisualizertr.h"
 #include "ctfvisualizertraceview.h"
 
 #include <coreplugin/actionmanager/actioncontainer.h>
diff --git a/src/plugins/ctfvisualizer/ctfvisualizertool.h b/src/plugins/ctfvisualizer/ctfvisualizertool.h
index af2284b5fa..21b2c059fb 100644
--- a/src/plugins/ctfvisualizer/ctfvisualizertool.h
+++ b/src/plugins/ctfvisualizer/ctfvisualizertool.h
@@ -4,12 +4,12 @@
 #pragma once
 
 #include "ctfvisualizerconstants.h"
-#include "ctfvisualizertr.h"
 
 #include <debugger/debuggermainwindow.h>
 #include <tracing/timelinemodelaggregator.h>
 #include <tracing/timelinezoomcontrol.h>
 
+#include <QCoreApplication>
 #include <QScopedPointer>
 
 namespace CtfVisualizer {
@@ -46,7 +46,8 @@ private:
     void toggleThreadRestriction(QAction *action);
 
     Utils::Perspective m_perspective{Constants::CtfVisualizerPerspectiveId,
-                                     ::CtfVisualizer::Tr::tr("Chrome Trace Format Visualizer")};
+                                     QCoreApplication::tr("::CtfVisualizer",
+                                                          "Chrome Trace Format Visualizer")};
 
     bool m_isLoading;
     QScopedPointer<QAction> m_loadJson;
diff --git a/src/plugins/fossil/fossilclient.cpp b/src/plugins/fossil/fossilclient.cpp
index 4b82bb87e0..842466c9ca 100644
--- a/src/plugins/fossil/fossilclient.cpp
+++ b/src/plugins/fossil/fossilclient.cpp
@@ -2,8 +2,10 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include "fossilclient.h"
-#include "fossileditor.h"
+
 #include "constants.h"
+#include "fossileditor.h"
+#include "fossiltr.h"
 
 #include <vcsbase/vcsbaseplugin.h>
 #include <vcsbase/vcsbaseeditor.h>
diff --git a/src/plugins/fossil/fossilplugin.cpp b/src/plugins/fossil/fossilplugin.cpp
index 37a32abf2f..94f800e1ea 100644
--- a/src/plugins/fossil/fossilplugin.cpp
+++ b/src/plugins/fossil/fossilplugin.cpp
@@ -2,13 +2,15 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include "fossilplugin.h"
+
+#include "commiteditor.h"
+#include "configuredialog.h"
 #include "constants.h"
 #include "fossilclient.h"
 #include "fossilcommitwidget.h"
 #include "fossileditor.h"
+#include "fossiltr.h"
 #include "pullorpushdialog.h"
-#include "configuredialog.h"
-#include "commiteditor.h"
 #include "wizard/fossiljsextension.h"
 
 #include <coreplugin/actionmanager/actionmanager.h>
diff --git a/src/plugins/git/gerrit/gerritserver.cpp b/src/plugins/git/gerrit/gerritserver.cpp
index 1ac7a64993..a02174b205 100644
--- a/src/plugins/git/gerrit/gerritserver.cpp
+++ b/src/plugins/git/gerrit/gerritserver.cpp
@@ -5,6 +5,7 @@
 #include "gerritparameters.h"
 #include "gerritserver.h"
 #include "../gitclient.h"
+#include "../gittr.h"
 
 #include <coreplugin/icore.h>
 
@@ -281,8 +282,8 @@ bool GerritServer::resolveRoot()
         case CertificateError:
             if (QMessageBox::question(
                         Core::ICore::dialogParent(),
-                        Tr::tr("Certificate Error"),
-                        Tr::tr(
+                        ::Git::Tr::tr("Certificate Error"),
+                        ::Git::Tr::tr(
                             "Server certificate for %1 cannot be authenticated.\n"
                             "Do you want to disable SSL verification for this server?\n"
                             "Note: This can expose you to man-in-the-middle attack.")
diff --git a/src/plugins/mesonprojectmanager/mesonactionsmanager.h b/src/plugins/mesonprojectmanager/mesonactionsmanager.h
index ee3826e692..8d306ba31e 100644
--- a/src/plugins/mesonprojectmanager/mesonactionsmanager.h
+++ b/src/plugins/mesonprojectmanager/mesonactionsmanager.h
@@ -3,10 +3,10 @@
 
 #pragma once
 
-#include "mesonprojectmanagertr.h"
-
 #include <utils/parameteraction.h>
 
+#include <QCoreApplication>
+
 namespace MesonProjectManager {
 namespace Internal {
 
@@ -14,8 +14,8 @@ class MesonActionsManager : public QObject
 {
     Q_OBJECT
     Utils::ParameterAction buildTargetContextAction{
-        ::MesonProjectManager::Tr::tr("Build"),
-        ::MesonProjectManager::Tr::tr("Build \"%1\""),
+        QCoreApplication::tr("::MesonProjectManager", "Build"),
+        QCoreApplication::tr("::MesonProjectManager", "Build \"%1\""),
         Utils::ParameterAction::AlwaysEnabled /*handled manually*/
     };
     QAction configureActionMenu;
diff --git a/src/plugins/perfprofiler/perfprofilerruncontrol.cpp b/src/plugins/perfprofiler/perfprofilerruncontrol.cpp
index 1d2fd90629..d14bfb87cd 100644
--- a/src/plugins/perfprofiler/perfprofilerruncontrol.cpp
+++ b/src/plugins/perfprofiler/perfprofilerruncontrol.cpp
@@ -5,6 +5,7 @@
 
 #include "perfdatareader.h"
 #include "perfprofilertool.h"
+#include "perfprofilertr.h"
 #include "perfrunconfigurationaspect.h"
 #include "perfsettings.h"
 
diff --git a/src/plugins/perfprofiler/perfprofilertool.cpp b/src/plugins/perfprofiler/perfprofilertool.cpp
index 4a215e9099..d4515f79b8 100644
--- a/src/plugins/perfprofiler/perfprofilertool.cpp
+++ b/src/plugins/perfprofiler/perfprofilertool.cpp
@@ -1,10 +1,12 @@
 // Copyright (C) 2018 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
+#include "perfprofilertool.h"
+
 #include "perfconfigwidget.h"
 #include "perfloaddialog.h"
 #include "perfprofilerplugin.h"
-#include "perfprofilertool.h"
+#include "perfprofilertr.h"
 #include "perfsettings.h"
 #include "perftracepointdialog.h"
 
diff --git a/src/plugins/perfprofiler/perfprofilertool.h b/src/plugins/perfprofiler/perfprofilertool.h
index 4a0e258da9..078d179237 100644
--- a/src/plugins/perfprofiler/perfprofilertool.h
+++ b/src/plugins/perfprofiler/perfprofilertool.h
@@ -6,7 +6,6 @@
 #include "perfprofilerconstants.h"
 #include "perfprofilerflamegraphview.h"
 #include "perfprofilerstatisticsview.h"
-#include "perfprofilertr.h"
 #include "perfprofilertraceview.h"
 #include "perftimelinemodelmanager.h"
 
@@ -84,7 +83,8 @@ private:
     void finalize();
 
     Utils::Perspective m_perspective{Constants::PerfProfilerPerspectiveId,
-                                     ::PerfProfiler::Tr::tr("Performance Analyzer")};
+                                     QCoreApplication::tr("::PerfProfiler",
+                                                          "Performance Analyzer")};
 
     QAction *m_startAction = nullptr;
     QAction *m_stopAction = nullptr;
diff --git a/src/plugins/projectexplorer/buildmanager.cpp b/src/plugins/projectexplorer/buildmanager.cpp
index 4a78ccfd0f..d04af1516a 100644
--- a/src/plugins/projectexplorer/buildmanager.cpp
+++ b/src/plugins/projectexplorer/buildmanager.cpp
@@ -15,6 +15,7 @@
 #include "projectexplorer.h"
 #include "projectexplorerconstants.h"
 #include "projectexplorersettings.h"
+#include "projectexplorertr.h"
 #include "runcontrol.h"
 #include "session.h"
 #include "target.h"
diff --git a/src/plugins/projectexplorer/compileoutputwindow.h b/src/plugins/projectexplorer/compileoutputwindow.h
index ae711e15ee..25020cc49d 100644
--- a/src/plugins/projectexplorer/compileoutputwindow.h
+++ b/src/plugins/projectexplorer/compileoutputwindow.h
@@ -6,11 +6,11 @@
 #include "buildstep.h"
 
 #include "projectexplorersettings.h"
-#include "projectexplorertr.h"
 
 #include <coreplugin/dialogs/ioptionspage.h>
 #include <coreplugin/ioutputpane.h>
 
+#include <QCoreApplication>
 
 QT_BEGIN_NAMESPACE
 class QToolButton;
@@ -36,7 +36,8 @@ public:
 
     QWidget *outputWidget(QWidget *) override;
     QList<QWidget *> toolBarWidgets() const override;
-    QString displayName() const override { return Tr::tr("Compile Output"); }
+    QString displayName() const override {
+        return QCoreApplication::tr("::ProjectExplorer","Compile Output"); }
     int priorityInStatusBar() const override;
     void clearContents() override;
     bool canFocus() const override;
diff --git a/src/plugins/projectexplorer/projectwelcomepage.h b/src/plugins/projectexplorer/projectwelcomepage.h
index 778c6af560..c4ac8945b4 100644
--- a/src/plugins/projectexplorer/projectwelcomepage.h
+++ b/src/plugins/projectexplorer/projectwelcomepage.h
@@ -5,13 +5,12 @@
 
 #include "projectexplorer.h"
 
-#include "projectexplorertr.h"
-
 #include <coreplugin/iwelcomepage.h>
 
 #include <utils/filepath.h>
 
 #include <QAbstractListModel>
+#include <QCoreApplication>
 
 namespace ProjectExplorer {
 namespace Internal {
@@ -44,7 +43,7 @@ class ProjectWelcomePage : public Core::IWelcomePage
 public:
     ProjectWelcomePage();
 
-    QString title() const override { return Tr::tr("Projects"); }
+    QString title() const override { return QCoreApplication::tr("::ProjectExplorer", "Projects"); }
     int priority() const override { return 20; }
     Utils::Id id() const override;
     QWidget *createWidget() const override;
diff --git a/src/plugins/scxmleditor/common/search.h b/src/plugins/scxmleditor/common/search.h
index 3ade6d357d..4daa699589 100644
--- a/src/plugins/scxmleditor/common/search.h
+++ b/src/plugins/scxmleditor/common/search.h
@@ -4,10 +4,10 @@
 #pragma once
 
 #include "outputpane.h"
-#include "scxmleditortr.h"
 
 #include <utils/utilsicons.h>
 
+#include <QCoreApplication>
 #include <QFrame>
 #include <QPointer>
 
@@ -40,7 +40,7 @@ public:
 
     QString title() const override
     {
-        return Tr::tr("Search");
+        return QCoreApplication::tr("::ScxmlEditor", "Search");
     }
 
     QIcon icon() const override