diff options
author | hjk <hjk@qt.io> | 2020-01-16 18:18:20 +0100 |
---|---|---|
committer | hjk <hjk@qt.io> | 2020-01-17 09:26:12 +0000 |
commit | 3818b44fdec0860a0adefde10dd7cedca2a3c569 (patch) | |
tree | 2a6cc6dca3cd4754243bf5129cdca36b356d1415 /src/plugins | |
parent | 20725da050b1fcac39f6bbe6973b6677c7e89ab5 (diff) |
De-Q_OBJECT-ify some more settings pages
Change-Id: I4700c9749c12c3fbe3adc9dc702283c8ce545ab2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/ios/iossettingspage.cpp | 2 | ||||
-rw-r--r-- | src/plugins/ios/iossettingspage.h | 2 | ||||
-rw-r--r-- | src/plugins/ios/iossettingswidget.h | 2 | ||||
-rw-r--r-- | src/plugins/macros/macrooptionspage.cpp | 13 | ||||
-rw-r--r-- | src/plugins/macros/macrooptionspage.h | 4 | ||||
-rw-r--r-- | src/plugins/mcusupport/mcusupportoptionspage.cpp | 8 | ||||
-rw-r--r-- | src/plugins/mcusupport/mcusupportoptionspage.h | 2 |
7 files changed, 14 insertions, 19 deletions
diff --git a/src/plugins/ios/iossettingspage.cpp b/src/plugins/ios/iossettingspage.cpp index a7e0f951d6..55dedf33ba 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 3dc9ce52d8..509ba5b8d3 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 482d1555fe..99f98b0853 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 40ccdb55cb..33e85b8c88 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 4544f518cd..faea36a968 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 e88be7c11d..b63db28c65 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 ffd6f49e2e..f273369a44 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(); }; |