Fix lupdate issues

When updating translations with
cmake --build . --target ts_de
(or other language ID)

- Qualifying with unknown namespace/class ::PluginSpecPrivate
- <class> lacks Q_OBJECT macro

Change-Id: Ic42d8dffea935e6b10e59223bdedb9a8a4dcf446
Reviewed-by: hjk <hjk@qt.io>

6 files changed, 74 insertions, 34 deletions

diff --git a/src/libs/extensionsystem/pluginspec.cpp b/src/libs/extensionsystem/pluginspec.cpp
index f4b1b93c86..92c7095efd 100644
--- a/src/libs/extensionsystem/pluginspec.cpp
+++ b/src/libs/extensionsystem/pluginspec.cpp
@@ -723,8 +723,10 @@ bool PluginSpecPrivate::readMetaData(const QJsonObject &pluginMetaData)
     }
 
     value = pluginMetaData.value(QLatin1String(PLUGIN_METADATA));
-    if (!value.isObject())
-        return reportError(tr("Plugin meta data not found"));
+    if (!value.isObject()) {
+        return reportError(
+            ::ExtensionSystem::Internal::PluginSpecPrivate::tr("Plugin meta data not found"));
+    }
     metaData = value.toObject();
 
     value = metaData.value(QLatin1String(PLUGIN_NAME));
@@ -806,9 +808,11 @@ bool PluginSpecPrivate::readMetaData(const QJsonObject &pluginMetaData)
     const QString platformSpec = value.toString().trimmed();
     if (!platformSpec.isEmpty()) {
         platformSpecification.setPattern(platformSpec);
-        if (!platformSpecification.isValid())
-            return reportError(tr("Invalid platform specification \"%1\": %2")
-                               .arg(platformSpec, platformSpecification.errorString()));
+        if (!platformSpecification.isValid()) {
+            return reportError(::ExtensionSystem::Internal::PluginSpecPrivate::tr(
+                                   "Invalid platform specification \"%1\": %2")
+                                   .arg(platformSpec, platformSpecification.errorString()));
+        }
     }
 
     value = metaData.value(QLatin1String(DEPENDENCIES));
@@ -822,22 +826,36 @@ bool PluginSpecPrivate::readMetaData(const QJsonObject &pluginMetaData)
             QJsonObject dependencyObject = v.toObject();
             PluginDependency dep;
             value = dependencyObject.value(QLatin1String(DEPENDENCY_NAME));
-            if (value.isUndefined())
-                return reportError(tr("Dependency: %1").arg(msgValueMissing(DEPENDENCY_NAME)));
-            if (!value.isString())
-                return reportError(tr("Dependency: %1").arg(msgValueIsNotAString(DEPENDENCY_NAME)));
+            if (value.isUndefined()) {
+                return reportError(
+                    ::ExtensionSystem::Internal::PluginSpecPrivate::tr("Dependency: %1")
+                        .arg(msgValueMissing(DEPENDENCY_NAME)));
+            }
+            if (!value.isString()) {
+                return reportError(
+                    ::ExtensionSystem::Internal::PluginSpecPrivate::tr("Dependency: %1")
+                        .arg(msgValueIsNotAString(DEPENDENCY_NAME)));
+            }
             dep.name = value.toString();
             value = dependencyObject.value(QLatin1String(DEPENDENCY_VERSION));
-            if (!value.isUndefined() && !value.isString())
-                return reportError(tr("Dependency: %1").arg(msgValueIsNotAString(DEPENDENCY_VERSION)));
+            if (!value.isUndefined() && !value.isString()) {
+                return reportError(
+                    ::ExtensionSystem::Internal::PluginSpecPrivate::tr("Dependency: %1")
+                        .arg(msgValueIsNotAString(DEPENDENCY_VERSION)));
+            }
             dep.version = value.toString();
-            if (!isValidVersion(dep.version))
-                return reportError(tr("Dependency: %1").arg(msgInvalidFormat(DEPENDENCY_VERSION,
-                                                                             dep.version)));
+            if (!isValidVersion(dep.version)) {
+                return reportError(
+                    ::ExtensionSystem::Internal::PluginSpecPrivate::tr("Dependency: %1")
+                        .arg(msgInvalidFormat(DEPENDENCY_VERSION, dep.version)));
+            }
             dep.type = PluginDependency::Required;
             value = dependencyObject.value(QLatin1String(DEPENDENCY_TYPE));
-            if (!value.isUndefined() && !value.isString())
-                return reportError(tr("Dependency: %1").arg(msgValueIsNotAString(DEPENDENCY_TYPE)));
+            if (!value.isUndefined() && !value.isString()) {
+                return reportError(
+                    ::ExtensionSystem::Internal::PluginSpecPrivate::tr("Dependency: %1")
+                        .arg(msgValueIsNotAString(DEPENDENCY_TYPE)));
+            }
             if (!value.isUndefined()) {
                 const QString typeValue = value.toString();
                 if (typeValue.toLower() == QLatin1String(DEPENDENCY_TYPE_HARD)) {
@@ -847,11 +865,13 @@ bool PluginSpecPrivate::readMetaData(const QJsonObject &pluginMetaData)
                 } else if (typeValue.toLower() == QLatin1String(DEPENDENCY_TYPE_TEST)) {
                     dep.type = PluginDependency::Test;
                 } else {
-                    return reportError(tr("Dependency: \"%1\" must be \"%2\" or \"%3\" (is \"%4\").")
-                                       .arg(QLatin1String(DEPENDENCY_TYPE),
-                                            QLatin1String(DEPENDENCY_TYPE_HARD),
-                                            QLatin1String(DEPENDENCY_TYPE_SOFT),
-                                            typeValue));
+                    return reportError(
+                        ::ExtensionSystem::Internal::PluginSpecPrivate::tr(
+                            "Dependency: \"%1\" must be \"%2\" or \"%3\" (is \"%4\").")
+                            .arg(QLatin1String(DEPENDENCY_TYPE),
+                                 QLatin1String(DEPENDENCY_TYPE_HARD),
+                                 QLatin1String(DEPENDENCY_TYPE_SOFT),
+                                 typeValue));
                 }
             }
             dependencies.append(dep);
@@ -869,20 +889,35 @@ bool PluginSpecPrivate::readMetaData(const QJsonObject &pluginMetaData)
             QJsonObject argumentObject = v.toObject();
             PluginArgumentDescription arg;
             value = argumentObject.value(QLatin1String(ARGUMENT_NAME));
-            if (value.isUndefined())
-                return reportError(tr("Argument: %1").arg(msgValueMissing(ARGUMENT_NAME)));
-            if (!value.isString())
-                return reportError(tr("Argument: %1").arg(msgValueIsNotAString(ARGUMENT_NAME)));
+            if (value.isUndefined()) {
+                return reportError(
+                    ::ExtensionSystem::Internal::PluginSpecPrivate::tr("Argument: %1")
+                        .arg(msgValueMissing(ARGUMENT_NAME)));
+            }
+            if (!value.isString()) {
+                return reportError(
+                    ::ExtensionSystem::Internal::PluginSpecPrivate::tr("Argument: %1")
+                        .arg(msgValueIsNotAString(ARGUMENT_NAME)));
+            }
             arg.name = value.toString();
-            if (arg.name.isEmpty())
-                return reportError(tr("Argument: \"%1\" is empty").arg(QLatin1String(ARGUMENT_NAME)));
+            if (arg.name.isEmpty()) {
+                return reportError(
+                    ::ExtensionSystem::Internal::PluginSpecPrivate::tr("Argument: \"%1\" is empty")
+                        .arg(QLatin1String(ARGUMENT_NAME)));
+            }
             value = argumentObject.value(QLatin1String(ARGUMENT_DESCRIPTION));
-            if (!value.isUndefined() && !value.isString())
-                return reportError(tr("Argument: %1").arg(msgValueIsNotAString(ARGUMENT_DESCRIPTION)));
+            if (!value.isUndefined() && !value.isString()) {
+                return reportError(
+                    ::ExtensionSystem::Internal::PluginSpecPrivate::tr("Argument: %1")
+                        .arg(msgValueIsNotAString(ARGUMENT_DESCRIPTION)));
+            }
             arg.description = value.toString();
             value = argumentObject.value(QLatin1String(ARGUMENT_PARAMETER));
-            if (!value.isUndefined() && !value.isString())
-                return reportError(tr("Argument: %1").arg(msgValueIsNotAString(ARGUMENT_PARAMETER)));
+            if (!value.isUndefined() && !value.isString()) {
+                return reportError(
+                    ::ExtensionSystem::Internal::PluginSpecPrivate::tr("Argument: %1")
+                        .arg(msgValueIsNotAString(ARGUMENT_PARAMETER)));
+            }
             arg.parameter = value.toString();
             argumentDescriptions.append(arg);
             qCDebug(pluginLog) << "Argument:" << arg.name << "Parameter:" << arg.parameter
diff --git a/src/libs/utils/qtcprocess.cpp b/src/libs/utils/qtcprocess.cpp
index 90299e06bb..6e2e38ff7a 100644
--- a/src/libs/utils/qtcprocess.cpp
+++ b/src/libs/utils/qtcprocess.cpp
@@ -638,7 +638,7 @@ public:
             start(commandString, QStringList(), workingDirectory, m_writeData);
         } else {
             if (!success) {
-                q->setErrorString(tr("Error in command line."));
+                q->setErrorString(QtcProcess::tr("Error in command line."));
                 // Should be FailedToStart, but we cannot set the process error from the outside,
                 // so it would be inconsistent.
                 emit q->errorOccurred(QProcess::UnknownError);
diff --git a/src/plugins/android/androiddevice.cpp b/src/plugins/android/androiddevice.cpp
index 8a79578051..1ede608bdd 100644
--- a/src/plugins/android/androiddevice.cpp
+++ b/src/plugins/android/androiddevice.cpp
@@ -639,7 +639,8 @@ void AndroidDeviceManager::HandleAvdsListChange()
             // of the device has changed, remove it and register it again with the new name.
             // Also account for the case of an AVD registered through old QC which might have
             // invalid data by checking the sdcard size value.
-            if (dev->displayName() != displayName || androidDev->sdcardSize() == tr("Unknown")) {
+            if (dev->displayName() != displayName
+                || androidDev->sdcardSize() == AndroidDevice::tr("Unknown")) {
                 devMgr->removeDevice(dev->id());
             } else {
                 // Find the state of the AVD retrieved from the AVD watcher
diff --git a/src/plugins/clangcodemodel/clangdclient.cpp b/src/plugins/clangcodemodel/clangdclient.cpp
index 50bd7ee24a..216b90da65 100644
--- a/src/plugins/clangcodemodel/clangdclient.cpp
+++ b/src/plugins/clangcodemodel/clangdclient.cpp
@@ -4021,7 +4021,7 @@ class MemoryTreeModel : public Utils::BaseTreeModel
 public:
     MemoryTreeModel(QObject *parent) : BaseTreeModel(parent)
     {
-        setHeader({tr("Component"), tr("Total Memory")});
+        setHeader({MemoryUsageWidget::tr("Component"), MemoryUsageWidget::tr("Total Memory")});
     }
 
     void update(const MemoryTree &tree)
diff --git a/src/plugins/studiowelcome/studiowelcomeplugin.h b/src/plugins/studiowelcome/studiowelcomeplugin.h
index cd6b8ea87f..1fdc811d37 100644
--- a/src/plugins/studiowelcome/studiowelcomeplugin.h
+++ b/src/plugins/studiowelcome/studiowelcomeplugin.h
@@ -38,6 +38,8 @@ namespace Internal {
 
 class StudioSettingsPage : public Core::IOptionsPageWidget
 {
+    Q_OBJECT
+
 public:
     void apply() final;
 
diff --git a/src/plugins/welcome/welcomeplugin.cpp b/src/plugins/welcome/welcomeplugin.cpp
index ef4c969be6..938e776ac8 100644
--- a/src/plugins/welcome/welcomeplugin.cpp
+++ b/src/plugins/welcome/welcomeplugin.cpp
@@ -110,6 +110,8 @@ void ResizeSignallingWidget::resizeEvent(QResizeEvent *event)
 
 class WelcomeMode : public IMode
 {
+    Q_OBJECT
+
 public:
     WelcomeMode();
     ~WelcomeMode();