From c181a53d01450afe0a0ed7fa3f160134aff00b4a Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Tue, 4 Feb 2020 09:02:50 +0100
Subject: [PATCH] Core, ProjectExplorer, Valgrind: Settingspage cosmetics

Change-Id: I79198c7d655b13dbd69d26b8e383a8eb57a8f9bc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 src/plugins/coreplugin/systemsettings.cpp                   | 2 +-
 src/plugins/coreplugin/systemsettings.h                     | 4 +---
 src/plugins/projectexplorer/devicesupport/sshsettingspage.h | 2 +-
 src/plugins/valgrind/valgrindconfigwidget.h                 | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/plugins/coreplugin/systemsettings.cpp b/src/plugins/coreplugin/systemsettings.cpp
index 48ace406d89..3917db7f7fd 100644
--- a/src/plugins/coreplugin/systemsettings.cpp
+++ b/src/plugins/coreplugin/systemsettings.cpp
@@ -260,7 +260,7 @@ void SystemSettingsWidget::showHelpForFileBrowser()
 SystemSettings::SystemSettings()
 {
     setId(Constants::SETTINGS_ID_SYSTEM);
-    setDisplayName(tr("System"));
+    setDisplayName(SystemSettingsWidget::tr("System"));
     setCategory(Constants::SETTINGS_CATEGORY_CORE);
     setWidgetCreator([] { return new SystemSettingsWidget; });
 }
diff --git a/src/plugins/coreplugin/systemsettings.h b/src/plugins/coreplugin/systemsettings.h
index 6d5582a17fc..8fae3d7dd32 100644
--- a/src/plugins/coreplugin/systemsettings.h
+++ b/src/plugins/coreplugin/systemsettings.h
@@ -30,10 +30,8 @@
 namespace Core {
 namespace Internal {
 
-class SystemSettings : public IOptionsPage
+class SystemSettings final : public IOptionsPage
 {
-    Q_OBJECT
-
 public:
     SystemSettings();
 };
diff --git a/src/plugins/projectexplorer/devicesupport/sshsettingspage.h b/src/plugins/projectexplorer/devicesupport/sshsettingspage.h
index c61f2fefd20..3a392a4c034 100644
--- a/src/plugins/projectexplorer/devicesupport/sshsettingspage.h
+++ b/src/plugins/projectexplorer/devicesupport/sshsettingspage.h
@@ -30,7 +30,7 @@
 namespace ProjectExplorer {
 namespace Internal {
 
-class SshSettingsPage : public Core::IOptionsPage
+class SshSettingsPage final : public Core::IOptionsPage
 {
 public:
     SshSettingsPage();
diff --git a/src/plugins/valgrind/valgrindconfigwidget.h b/src/plugins/valgrind/valgrindconfigwidget.h
index 56807f2cb50..0cef8a9d739 100644
--- a/src/plugins/valgrind/valgrindconfigwidget.h
+++ b/src/plugins/valgrind/valgrindconfigwidget.h
@@ -31,7 +31,7 @@
 namespace Valgrind {
 namespace Internal {
 
-class ValgrindOptionsPage : public Core::IOptionsPage
+class ValgrindOptionsPage final : public Core::IOptionsPage
 {
 public:
     ValgrindOptionsPage();