From 574065b31430245a66808561b1b95139c4cd19f2 Mon Sep 17 00:00:00 2001
From: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Date: Sat, 29 Sep 2018 22:13:44 +0200
Subject: Cleanup: reinstate override modifiers

This reverts commit 1c4a859c8d0b37b2e938209fe9c4d99e9758327a,
where the override modifiers were removed owing to the noisy
"inconsistent override modifiers" which is default-on in clang.

This warning was disabled in 77577f717f5aad38ea8c4c41c10c181486c4337f,
so we can reinstate the overrides.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 desktop-widgets/preferences/preferences_defaults.h     | 4 ++--
 desktop-widgets/preferences/preferences_georeference.h | 4 ++--
 desktop-widgets/preferences/preferences_graph.h        | 4 ++--
 desktop-widgets/preferences/preferences_language.h     | 4 ++--
 desktop-widgets/preferences/preferences_network.h      | 4 ++--
 desktop-widgets/preferences/preferences_units.h        | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'desktop-widgets/preferences')

diff --git a/desktop-widgets/preferences/preferences_defaults.h b/desktop-widgets/preferences/preferences_defaults.h
index 431db4b88..0fa7bdc1b 100644
--- a/desktop-widgets/preferences/preferences_defaults.h
+++ b/desktop-widgets/preferences/preferences_defaults.h
@@ -14,8 +14,8 @@ class PreferencesDefaults : public AbstractPreferencesWidget {
 public:
 	PreferencesDefaults();
 	~PreferencesDefaults();
-	void refreshSettings();
-	void syncSettings();
+	void refreshSettings() override;
+	void syncSettings() override;
 public slots:
 	void on_chooseFile_clicked();
 	void on_btnUseDefaultFile_toggled(bool toggled);
diff --git a/desktop-widgets/preferences/preferences_georeference.h b/desktop-widgets/preferences/preferences_georeference.h
index 237281349..a24603bc2 100644
--- a/desktop-widgets/preferences/preferences_georeference.h
+++ b/desktop-widgets/preferences/preferences_georeference.h
@@ -13,8 +13,8 @@ class PreferencesGeoreference : public AbstractPreferencesWidget {
 public:
 	PreferencesGeoreference();
 	~PreferencesGeoreference();
-	void refreshSettings();
-	void syncSettings();
+	void refreshSettings() override;
+	void syncSettings() override;
 private:
 	Ui::PreferencesGeoreference *ui;
 };
diff --git a/desktop-widgets/preferences/preferences_graph.h b/desktop-widgets/preferences/preferences_graph.h
index c63a0372e..4fc9cd5b3 100644
--- a/desktop-widgets/preferences/preferences_graph.h
+++ b/desktop-widgets/preferences/preferences_graph.h
@@ -13,8 +13,8 @@ class PreferencesGraph : public AbstractPreferencesWidget {
 public:
 	PreferencesGraph();
 	~PreferencesGraph();
-	void refreshSettings();
-	void syncSettings();
+	void refreshSettings() override;
+	void syncSettings() override;
 
 private slots:
 	void on_gflow_valueChanged(int gf);
diff --git a/desktop-widgets/preferences/preferences_language.h b/desktop-widgets/preferences/preferences_language.h
index 8f3d14d52..a62d4d3dc 100644
--- a/desktop-widgets/preferences/preferences_language.h
+++ b/desktop-widgets/preferences/preferences_language.h
@@ -14,8 +14,8 @@ class PreferencesLanguage : public AbstractPreferencesWidget {
 public:
 	PreferencesLanguage();
 	~PreferencesLanguage();
-	void refreshSettings();
-	void syncSettings();
+	void refreshSettings() override;
+	void syncSettings() override;
 private:
 	Ui::PreferencesLanguage *ui;
 	QMap<QString, QString> dateFormatShortMap;
diff --git a/desktop-widgets/preferences/preferences_network.h b/desktop-widgets/preferences/preferences_network.h
index 58a1757cb..f4b2125aa 100644
--- a/desktop-widgets/preferences/preferences_network.h
+++ b/desktop-widgets/preferences/preferences_network.h
@@ -14,8 +14,8 @@ class PreferencesNetwork : public AbstractPreferencesWidget {
 public:
 	PreferencesNetwork();
 	~PreferencesNetwork();
-	void refreshSettings();
-	void syncSettings();
+	void refreshSettings() override;
+	void syncSettings() override;
 
 public slots:
 	void proxyType_changed(int i);
diff --git a/desktop-widgets/preferences/preferences_units.h b/desktop-widgets/preferences/preferences_units.h
index bf2bcf043..1f276d178 100644
--- a/desktop-widgets/preferences/preferences_units.h
+++ b/desktop-widgets/preferences/preferences_units.h
@@ -13,8 +13,8 @@ class PreferencesUnits : public AbstractPreferencesWidget {
 public:
 	PreferencesUnits();
 	~PreferencesUnits();
-	void refreshSettings();
-	void syncSettings();
+	void refreshSettings() override;
+	void syncSettings() override;
 private:
 	Ui::PreferencesUnits *ui;
 };
-- 
cgit v1.2.3-70-g09d2