7 files changed, 14 insertions, 19 deletions
diff --git a/src/plugins/ios/iossettingspage.cpp b/src/plugins/ios/iossettingspage.cpp
index a7e0f951d6c..55dedf33ba5 100644
--- a/src/plugins/ios/iossettingspage.cpp
+++ b/src/plugins/ios/iossettingspage.cpp
@@ -38,7 +38,7 @@ namespace Internal {
 IosSettingsPage::IosSettingsPage()
 {
     setId(Constants::IOS_SETTINGS_ID);
-    setDisplayName(tr("iOS"));
+    setDisplayName(IosSettingsWidget::tr("iOS"));
     setCategory(ProjectExplorer::Constants::DEVICE_SETTINGS_CATEGORY);
     setWidgetCreator([] { return new IosSettingsWidget; });
 }
diff --git a/src/plugins/ios/iossettingspage.h b/src/plugins/ios/iossettingspage.h
index 3dc9ce52d8b..509ba5b8d31 100644
--- a/src/plugins/ios/iossettingspage.h
+++ b/src/plugins/ios/iossettingspage.h
@@ -32,8 +32,6 @@ namespace Internal {
 
 class IosSettingsPage : public Core::IOptionsPage
 {
-    Q_OBJECT
-
 public:
     IosSettingsPage();
 };
diff --git a/src/plugins/ios/iossettingswidget.h b/src/plugins/ios/iossettingswidget.h
index 482d1555fe9..99f98b08531 100644
--- a/src/plugins/ios/iossettingswidget.h
+++ b/src/plugins/ios/iossettingswidget.h
@@ -37,7 +37,7 @@ namespace Ui { class IosSettingsWidget; }
 
 class IosSettingsWidget : public Core::IOptionsPageWidget
 {
-    Q_OBJECT
+    Q_DECLARE_TR_FUNCTIONS(Ios::Internal::IosSettingsWidget)
 
 public:
     IosSettingsWidget();
diff --git a/src/plugins/macros/macrooptionspage.cpp b/src/plugins/macros/macrooptionspage.cpp
index 40ccdb55cb1..33e85b8c882 100644
--- a/src/plugins/macros/macrooptionspage.cpp
+++ b/src/plugins/macros/macrooptionspage.cpp
@@ -31,17 +31,16 @@
 
 #include <texteditor/texteditorconstants.h>
 
-#include <QCoreApplication>
-#include <QWidget>
-
-using namespace Macros;
-using namespace Macros::Internal;
-
+namespace Macros {
+namespace Internal {
 
 MacroOptionsPage::MacroOptionsPage()
 {
     setId(Constants::M_OPTIONS_PAGE);
-    setDisplayName(QCoreApplication::translate("Macros", Constants::M_OPTIONS_TR_PAGE));
+    setDisplayName(MacroOptionsWidget::tr("Macros"));
     setCategory(TextEditor::Constants::TEXT_EDITOR_SETTINGS_CATEGORY);
     setWidgetCreator([] { return new MacroOptionsWidget; });
 }
+
+} // Internal
+} // Macros
diff --git a/src/plugins/macros/macrooptionspage.h b/src/plugins/macros/macrooptionspage.h
index 4544f518cd1..faea36a968c 100644
--- a/src/plugins/macros/macrooptionspage.h
+++ b/src/plugins/macros/macrooptionspage.h
@@ -30,10 +30,8 @@
 namespace Macros {
 namespace Internal {
 
-class MacroOptionsPage : public Core::IOptionsPage
+class MacroOptionsPage final : public Core::IOptionsPage
 {
-    Q_OBJECT
-
 public:
     MacroOptionsPage();
 };
diff --git a/src/plugins/mcusupport/mcusupportoptionspage.cpp b/src/plugins/mcusupport/mcusupportoptionspage.cpp
index e88be7c11db..b63db28c656 100644
--- a/src/plugins/mcusupport/mcusupportoptionspage.cpp
+++ b/src/plugins/mcusupport/mcusupportoptionspage.cpp
@@ -55,6 +55,8 @@ static bool cMakeAvailable()
 
 class McuSupportOptionsWidget : public Core::IOptionsPageWidget
 {
+    Q_DECLARE_TR_FUNCTIONS(McuSupport::Internal::McuSupportOptionsWidget)
+
 public:
     McuSupportOptionsWidget();
 
@@ -81,7 +83,7 @@ McuSupportOptionsWidget::McuSupportOptionsWidget()
     auto mainLayout = new QVBoxLayout(this);
 
     auto mcuTargetChooserlayout = new QHBoxLayout;
-    auto mcuTargetChooserLabel = new QLabel(McuSupportOptionsPage::tr("Target:"));
+    auto mcuTargetChooserLabel = new QLabel(tr("Target:"));
     mcuTargetChooserlayout->addWidget(mcuTargetChooserLabel);
     m_mcuTargetComboBox = new QComboBox;
     mcuTargetChooserLabel->setBuddy(m_mcuTargetComboBox);
@@ -93,7 +95,7 @@ McuSupportOptionsWidget::McuSupportOptionsWidget()
     mcuTargetChooserlayout->addWidget(m_mcuTargetComboBox);
     mainLayout->addLayout(mcuTargetChooserlayout);
 
-    auto m_packagesGroupBox = new QGroupBox(McuSupportOptionsPage::tr("Packages"));
+    auto m_packagesGroupBox = new QGroupBox(tr("Packages"));
     mainLayout->addWidget(m_packagesGroupBox);
     m_packagesLayout = new QFormLayout;
     m_packagesGroupBox->setLayout(m_packagesLayout);
@@ -199,7 +201,7 @@ void McuSupportOptionsWidget::apply()
 McuSupportOptionsPage::McuSupportOptionsPage()
 {
     setId(Core::Id(Constants::SETTINGS_ID));
-    setDisplayName(tr("MCU"));
+    setDisplayName(McuSupportOptionsWidget::tr("MCU"));
     setCategory(ProjectExplorer::Constants::DEVICE_SETTINGS_CATEGORY);
     setWidgetCreator([] { return new McuSupportOptionsWidget; });
 }
diff --git a/src/plugins/mcusupport/mcusupportoptionspage.h b/src/plugins/mcusupport/mcusupportoptionspage.h
index ffd6f49e2ef..f273369a448 100644
--- a/src/plugins/mcusupport/mcusupportoptionspage.h
+++ b/src/plugins/mcusupport/mcusupportoptionspage.h
@@ -32,8 +32,6 @@ namespace Internal {
 
 class McuSupportOptionsPage : public Core::IOptionsPage
 {
-    Q_OBJECT
-
 public:
     McuSupportOptionsPage();
 };