TextEditor: Tr::tr

Change-Id: I28aa68e25c53c3a4d1c370074d7b3318944dc45a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>

4 files changed, 41 insertions, 32 deletions

diff --git a/src/plugins/texteditor/snippets/snippet.cpp b/src/plugins/texteditor/snippets/snippet.cpp
index 71ec46c7c6..f41156c4ce 100644
--- a/src/plugins/texteditor/snippets/snippet.cpp
+++ b/src/plugins/texteditor/snippets/snippet.cpp
@@ -3,6 +3,8 @@
 
 #include "snippet.h"
 
+#include "../texteditortr.h"
+
 #include <utils/algorithm.h>
 #include <utils/macroexpander.h>
 #include <utils/qtcassert.h>
@@ -10,7 +12,7 @@
 
 #include <QTextDocument>
 
-using namespace TextEditor;
+namespace TextEditor {
 
 const char UCMANGLER_ID[] = "TextEditor::UppercaseMangler";
 const char LCMANGLER_ID[] = "TextEditor::LowercaseMangler";
@@ -221,7 +223,7 @@ SnippetParseResult Snippet::parse(const QString &snippet)
         }
 
         if (mangler) {
-            return SnippetParseResult{SnippetParseError{tr("Expected delimiter after mangler ID."),
+            return SnippetParseResult{SnippetParseError{Tr::tr("Expected delimiter after mangler ID."),
                                                         preprocessedSnippet,
                                                         i}};
         }
@@ -236,7 +238,7 @@ SnippetParseResult Snippet::parse(const QString &snippet)
                 mangler = &tcMangler;
             } else {
                 return SnippetParseResult{
-                    SnippetParseError{tr("Expected mangler ID \"l\" (lowercase), \"u\" (uppercase), "
+                    SnippetParseError{Tr::tr("Expected mangler ID \"l\" (lowercase), \"u\" (uppercase), "
                                          "or \"c\" (titlecase) after colon."),
                                       preprocessedSnippet,
                                       i}};
@@ -259,7 +261,7 @@ SnippetParseResult Snippet::parse(const QString &snippet)
 
     if (inVar) {
         return SnippetParseResult{
-            SnippetParseError{tr("Missing closing variable delimiter for:"), currentPart.text, 0}};
+            SnippetParseError{Tr::tr("Missing closing variable delimiter for:"), currentPart.text, 0}};
     }
 
     if (!currentPart.text.isEmpty())
@@ -268,6 +270,10 @@ SnippetParseResult Snippet::parse(const QString &snippet)
     return SnippetParseResult(result);
 }
 
+} // Texteditor
+
+using namespace TextEditor;
+
 #ifdef WITH_TESTS
 #   include <QTest>
 
diff --git a/src/plugins/texteditor/snippets/snippet.h b/src/plugins/texteditor/snippets/snippet.h
index 4dd5716946..8fff9be4a1 100644
--- a/src/plugins/texteditor/snippets/snippet.h
+++ b/src/plugins/texteditor/snippets/snippet.h
@@ -16,7 +16,6 @@ namespace TextEditor {
 
 class TEXTEDITOR_EXPORT Snippet
 {
-    Q_DECLARE_TR_FUNCTIONS(Snippet)
 public:
     explicit Snippet(const QString &groupId = QString(), const QString &id = QString());
     ~Snippet();
diff --git a/src/plugins/texteditor/snippets/snippetscollection.cpp b/src/plugins/texteditor/snippets/snippetscollection.cpp
index 3b6ba0bf95..c9b148360b 100644
--- a/src/plugins/texteditor/snippets/snippetscollection.cpp
+++ b/src/plugins/texteditor/snippets/snippetscollection.cpp
@@ -2,17 +2,19 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include "snippetscollection.h"
+
 #include "snippetprovider.h"
 #include "reuse.h"
+#include "../texteditortr.h"
 
 #include <coreplugin/icore.h>
+
 #include <extensionsystem/pluginmanager.h>
+
 #include <utils/algorithm.h>
 #include <utils/fileutils.h>
 
-#include <QLatin1String>
 #include <QFile>
-#include <QFileInfo>
 #include <QDir>
 #include <QDebug>
 #include <QXmlStreamReader>
@@ -282,7 +284,7 @@ void SnippetsCollection::reload()
 bool SnippetsCollection::synchronize(QString *errorString)
 {
     if (!m_userSnippetsFile.parentDir().ensureWritableDir()) {
-        *errorString = tr("Cannot create user snippet directory %1")
+        *errorString = Tr::tr("Cannot create user snippet directory %1")
                 .arg(m_userSnippetsFile.parentDir().toUserOutput());
         return false;
     }
@@ -354,8 +356,7 @@ QList<Snippet> SnippetsCollection::readXML(const FilePath &fileName, const QStri
                         } else if (isGroupKnown(groupId) && (snippetId.isEmpty() || snippetId == id)) {
                             Snippet snippet(groupId, id);
                             snippet.setTrigger(trigger);
-                            snippet.setComplement(QCoreApplication::translate(
-                                                      "TextEditor::Internal::Snippets",
+                            snippet.setComplement(QCoreApplication::translate("::TextEditor",
                                                       atts.value(kComplement).toString().toLatin1(),
                                                       atts.value(kId).toString().toLatin1()));
                             snippet.setIsRemoved(toBool(atts.value(kRemoved).toString()));
diff --git a/src/plugins/texteditor/snippets/snippetssettingspage.cpp b/src/plugins/texteditor/snippets/snippetssettingspage.cpp
index 18aac728b9..b64910a0f1 100644
--- a/src/plugins/texteditor/snippets/snippetssettingspage.cpp
+++ b/src/plugins/texteditor/snippets/snippetssettingspage.cpp
@@ -2,18 +2,22 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include "snippetssettingspage.h"
+
 #include "snippeteditor.h"
 #include "snippetprovider.h"
 #include "snippet.h"
 #include "snippetscollection.h"
 #include "snippetssettings.h"
+#include "../fontsettings.h"
+#include "../textdocument.h"
+#include "../texteditorconstants.h"
+#include "../texteditorsettings.h"
+#include "../texteditortr.h"
 
 #include <coreplugin/icore.h>
-#include <texteditor/fontsettings.h>
-#include <texteditor/textdocument.h>
-#include <texteditor/texteditorconstants.h>
-#include <texteditor/texteditorsettings.h>
+
 #include <extensionsystem/pluginmanager.h>
+
 #include <utils/headerviewstretcher.h>
 #include <utils/itemviews.h>
 #include <utils/layoutbuilder.h>
@@ -118,8 +122,8 @@ bool SnippetsTableModel::setData(const QModelIndex &modelIndex, const QVariant &
             if (!Snippet::isValidTrigger(s)) {
                 QMessageBox::critical(
                     Core::ICore::dialogParent(),
-                    tr("Error"),
-                    tr("Not a valid trigger. A valid trigger can only contain letters, "
+                    Tr::tr("Error"),
+                    Tr::tr("Not a valid trigger. A valid trigger can only contain letters, "
                        "numbers, or underscores, where the first character is "
                        "limited to letter or underscore."));
                 if (snippet.trigger().isEmpty())
@@ -143,9 +147,9 @@ QVariant SnippetsTableModel::headerData(int section, Qt::Orientation orientation
         return QVariant();
 
     if (section == 0)
-        return tr("Trigger");
+        return Tr::tr("Trigger");
     else
-        return tr("Trigger Variant");
+        return Tr::tr("Trigger Variant");
 }
 
 void SnippetsTableModel::load(const QString &groupId)
@@ -197,8 +201,8 @@ void SnippetsTableModel::revertBuitInSnippet(const QModelIndex &modelIndex)
 {
     const Snippet &snippet = m_collection->revertedSnippet(modelIndex.row(), m_activeGroupId);
     if (snippet.id().isEmpty()) {
-        QMessageBox::critical(Core::ICore::dialogParent(), tr("Error"),
-                              tr("Error reverting snippet."));
+        QMessageBox::critical(Core::ICore::dialogParent(), Tr::tr("Error"),
+                              Tr::tr("Error reverting snippet."));
         return;
     }
     replaceSnippet(snippet, modelIndex);
@@ -243,8 +247,6 @@ void SnippetsTableModel::replaceSnippet(const Snippet &snippet, const QModelInde
 // SnippetsSettingsPagePrivate
 class SnippetsSettingsPagePrivate : public QObject
 {
-    Q_DECLARE_TR_FUNCTIONS(TextEditor::Internal::SnippetsSettingsPage)
-
 public:
     SnippetsSettingsPagePrivate();
     ~SnippetsSettingsPagePrivate() override { delete m_model; }
@@ -321,7 +323,7 @@ void SnippetsSettingsPagePrivate::configureUi(QWidget *w)
     m_snippetsTable->setRootIsDecorated(false);
     m_snippetsTable->setModel(m_model);
 
-    m_revertButton = new QPushButton(tr("Revert Built-in"));
+    m_revertButton = new QPushButton(Tr::tr("Revert Built-in"));
     m_revertButton->setEnabled(false);
 
     auto snippetSplitter = new QSplitter(Qt::Vertical);
@@ -332,18 +334,18 @@ void SnippetsSettingsPagePrivate::configureUi(QWidget *w)
 
     using namespace Utils::Layouting;
     Column {
-        Row { tr("Group:"), m_groupCombo, st },
+        Row { Tr::tr("Group:"), m_groupCombo, st },
         Row {
             snippetSplitter,
             Column {
-                PushButton { text(tr("Add")),
+                PushButton { text(Tr::tr("Add")),
                              onClicked([this] { addSnippet(); }, this) },
-                PushButton { text(tr("Remove")),
+                PushButton { text(Tr::tr("Remove")),
                              onClicked([this] { removeSnippet(); }, this) },
                 m_revertButton,
-                PushButton { text(tr("Restore Removed Built-ins")),
+                PushButton { text(Tr::tr("Restore Removed Built-ins")),
                              onClicked([this] { restoreRemovedBuiltInSnippets(); }, this) },
-                PushButton { text(tr("Reset All")),
+                PushButton { text(Tr::tr("Reset All")),
                              onClicked([this] { resetAllSnippets(); }, this) },
                 st,
             }
@@ -395,7 +397,7 @@ void SnippetsSettingsPagePrivate::apply()
             m_snippetsCollectionChanged = false;
         } else {
             QMessageBox::critical(Core::ICore::dialogParent(),
-                                  tr("Error While Saving Snippet Collection"), errorString);
+                                  Tr::tr("Error While Saving Snippet Collection"), errorString);
         }
     }
 }
@@ -467,7 +469,7 @@ void SnippetsSettingsPagePrivate::removeSnippet()
 {
     const QModelIndex &modelIndex = m_snippetsTable->selectionModel()->currentIndex();
     if (!modelIndex.isValid()) {
-        QMessageBox::critical(Core::ICore::dialogParent(), tr("Error"), tr("No snippet selected."));
+        QMessageBox::critical(Core::ICore::dialogParent(), Tr::tr("Error"), Tr::tr("No snippet selected."));
         return;
     }
     m_model->removeSnippet(modelIndex);
@@ -546,13 +548,14 @@ void SnippetsSettingsPagePrivate::decorateEditors(const TextEditor::FontSettings
 }
 
 // SnippetsSettingsPage
+
 SnippetsSettingsPage::SnippetsSettingsPage()
     : d(new SnippetsSettingsPagePrivate)
 {
     setId(Constants::TEXT_EDITOR_SNIPPETS_SETTINGS);
-    setDisplayName(SnippetsSettingsPagePrivate::tr("Snippets"));
+    setDisplayName(Tr::tr("Snippets"));
     setCategory(TextEditor::Constants::TEXT_EDITOR_SETTINGS_CATEGORY);
-    setDisplayCategory(QCoreApplication::translate("::TextEditor", "Text Editor"));
+    setDisplayCategory(Tr::tr("Text Editor"));
     setCategoryIconPath(TextEditor::Constants::TEXT_EDITOR_SETTINGS_CATEGORY_ICON_PATH);
 }