summaryrefslogtreecommitdiffstats
path: root/desktop-widgets/preferences
diff options
context:
space:
mode:
authorGravatar Berthold Stoeger <bstoeger@mail.tuwien.ac.at>2018-09-29 22:13:44 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2018-09-29 15:23:25 -0700
commit574065b31430245a66808561b1b95139c4cd19f2 (patch)
tree844736a0bf6969af96953db49d247123ff92f787 /desktop-widgets/preferences
parentd7e3d68f368a2febcc17b436e097a97a7c0f8ad3 (diff)
downloadsubsurface-574065b31430245a66808561b1b95139c4cd19f2.tar.gz
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>
Diffstat (limited to 'desktop-widgets/preferences')
-rw-r--r--desktop-widgets/preferences/preferences_defaults.h4
-rw-r--r--desktop-widgets/preferences/preferences_georeference.h4
-rw-r--r--desktop-widgets/preferences/preferences_graph.h4
-rw-r--r--desktop-widgets/preferences/preferences_language.h4
-rw-r--r--desktop-widgets/preferences/preferences_network.h4
-rw-r--r--desktop-widgets/preferences/preferences_units.h4
6 files changed, 12 insertions, 12 deletions
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;
};