From d4b81a6d777de45611034b26bd89973d19e60c96 Mon Sep 17 00:00:00 2001
From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Wed, 5 Sep 2018 00:56:14 +0200
Subject: [PATCH] clang-tidy: Mark several settingspage methods as final

To avoid warnings about calling virtual methods during construction,
mark affected methods as final. It's legitimate to call things like
load() from their ctors as long as nobody inherits from them.
---
 src/qtui/settingspages/bufferviewsettingspage.h    | 10 +++-------
 src/qtui/settingspages/corehighlightsettingspage.h |  6 +++---
 src/qtui/settingspages/dccsettingspage.h           |  6 +++---
 src/qtui/settingspages/identitiessettingspage.h    | 10 +++-------
 src/qtui/settingspages/notificationssettingspage.h | 12 ++++--------
 5 files changed, 16 insertions(+), 28 deletions(-)

diff --git a/src/qtui/settingspages/bufferviewsettingspage.h b/src/qtui/settingspages/bufferviewsettingspage.h
index 2f54c476..402c823d 100644
--- a/src/qtui/settingspages/bufferviewsettingspage.h
+++ b/src/qtui/settingspages/bufferviewsettingspage.h
@@ -18,8 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#ifndef BUFFERVIEWSETTINGSPAGE_H
-#define BUFFERVIEWSETTINGSPAGE_H
+#pragma once
 
 #include "settingspage.h"
 #include "ui_bufferviewsettingspage.h"
@@ -38,8 +37,8 @@ public:
     ~BufferViewSettingsPage();
 
 public slots:
-    void save();
-    void load();
+    void save() final override;
+    void load() final override;
     void reset();
 
 private slots:
@@ -107,6 +106,3 @@ private:
 
     QStringList existing;
 };
-
-
-#endif // BUFFERVIEWSETTINGSPAGE_H
diff --git a/src/qtui/settingspages/corehighlightsettingspage.h b/src/qtui/settingspages/corehighlightsettingspage.h
index 0d9150da..03681e3c 100644
--- a/src/qtui/settingspages/corehighlightsettingspage.h
+++ b/src/qtui/settingspages/corehighlightsettingspage.h
@@ -40,9 +40,9 @@ public:
     bool isSelectable() const override;
 
 public slots:
-    void save() override;
-    void load() override;
-    void defaults() override;
+    void save() final override;
+    void load() final override;
+    void defaults() final override;
     void revert();
     void clientConnected();
 
diff --git a/src/qtui/settingspages/dccsettingspage.h b/src/qtui/settingspages/dccsettingspage.h
index f590a5c0..38023a2b 100644
--- a/src/qtui/settingspages/dccsettingspage.h
+++ b/src/qtui/settingspages/dccsettingspage.h
@@ -44,9 +44,9 @@ public:
 
 public slots:
     // See base class docs
-    void save() override;
-    void load() override;
-    void defaults() override;
+    void save() final override;
+    void load() final override;
+    void defaults() final override;
 
 private:
     /**
diff --git a/src/qtui/settingspages/identitiessettingspage.h b/src/qtui/settingspages/identitiessettingspage.h
index b1213ad8..84091ea7 100644
--- a/src/qtui/settingspages/identitiessettingspage.h
+++ b/src/qtui/settingspages/identitiessettingspage.h
@@ -18,8 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#ifndef IDENTITIESSETTINGSPAGE_H
-#define IDENTITIESSETTINGSPAGE_H
+#pragma once
 
 #include "clientidentity.h"
 #include "settingspage.h"
@@ -44,8 +43,8 @@ public:
     bool aboutToSave();
 
 public slots:
-    void save();
-    void load();
+    void save() final override;
+    void load() final override;
 
 private slots:
     void coreConnectionStateChanged(bool);
@@ -127,6 +126,3 @@ private:
 
     int numevents, rcvevents;
 };
-
-
-#endif
diff --git a/src/qtui/settingspages/notificationssettingspage.h b/src/qtui/settingspages/notificationssettingspage.h
index 8000bcd0..c30396e9 100644
--- a/src/qtui/settingspages/notificationssettingspage.h
+++ b/src/qtui/settingspages/notificationssettingspage.h
@@ -18,8 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#ifndef NOTIFICATIONSSETTINGSPAGE_H_
-#define NOTIFICATIONSSETTINGSPAGE_H_
+#pragma once
 
 #include <QHash>
 
@@ -40,9 +39,9 @@ public:
     bool hasDefaults() const;
 
 public slots:
-    void save();
-    void load();
-    void defaults();
+    void save() final override;
+    void load() final override;
+    void defaults() final override;
 
 private slots:
     void widgetHasChanged();
@@ -51,6 +50,3 @@ private:
     QList<SettingsPage *> _configWidgets;
     bool _hasDefaults;
 };
-
-
-#endif
-- 
2.20.1