From 875dc22ef43304cda057d747b50ce080bdbaad4b Mon Sep 17 00:00:00 2001
From: Christian Stenger <christian.stenger@qt.io>
Date: Fri, 24 Mar 2023 06:53:02 +0100
Subject: [PATCH] Terminal: Do not use plugin tr includes inside header

...to avoid accidently including it elsewhere and using a
different Tr::tr() in turn.
Amends a485f18a941.

Change-Id: Iee5b6626ebf53cd2c18833f48ca1a603c3cbff8b
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
---
 src/plugins/terminal/terminalcommands.h | 27 +++++++++++++------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/plugins/terminal/terminalcommands.h b/src/plugins/terminal/terminalcommands.h
index 5257913fba7..613d0d98229 100644
--- a/src/plugins/terminal/terminalcommands.h
+++ b/src/plugins/terminal/terminalcommands.h
@@ -3,9 +3,8 @@
 
 #pragma once
 
-#include "terminaltr.h"
-
 #include <QAction>
+#include <QCoreApplication>
 #include <QKeyEvent>
 
 namespace Core {
@@ -17,21 +16,23 @@ namespace Terminal {
 
 struct WidgetActions
 {
-    QAction copy{Tr::tr("Copy")};
-    QAction paste{Tr::tr("Paste")};
-    QAction clearSelection{Tr::tr("Clear Selection")};
-    QAction clearTerminal{Tr::tr("Clear Terminal")};
-    QAction moveCursorWordLeft{Tr::tr("Move Cursor Word Left")};
-    QAction moveCursorWordRight{Tr::tr("Move Cursor Word Right")};
+    QAction copy{QCoreApplication::translate("QtC::Terminal", "Copy")};
+    QAction paste{QCoreApplication::translate("QtC::Terminal", "Paste")};
+    QAction clearSelection{QCoreApplication::translate("QtC::Terminal", "Clear Selection")};
+    QAction clearTerminal{QCoreApplication::translate("QtC::Terminal", "Clear Terminal")};
+    QAction moveCursorWordLeft{QCoreApplication::translate("QtC::Terminal",
+                                                           "Move Cursor Word Left")};
+    QAction moveCursorWordRight{QCoreApplication::translate("QtC::Terminal",
+                                                            "Move Cursor Word Right")};
 };
 
 struct PaneActions
 {
-    QAction newTerminal{Tr::tr("New Terminal")};
-    QAction closeTerminal{Tr::tr("Close Terminal")};
-    QAction nextTerminal{Tr::tr("Next Terminal")};
-    QAction prevTerminal{Tr::tr("Previous Terminal")};
-    QAction minMax{Tr::tr("Minimize/Maximize Terminal")};
+    QAction newTerminal{QCoreApplication::translate("QtC::Terminal", "New Terminal")};
+    QAction closeTerminal{QCoreApplication::translate("QtC::Terminal", "Close Terminal")};
+    QAction nextTerminal{QCoreApplication::translate("QtC::Terminal", "Next Terminal")};
+    QAction prevTerminal{QCoreApplication::translate("QtC::Terminal", "Previous Terminal")};
+    QAction minMax{QCoreApplication::translate("QtC::Terminal", "Minimize/Maximize Terminal")};
 };
 
 class TerminalCommands