summaryrefslogtreecommitdiffstats
path: root/desktop-widgets/preferences
diff options
context:
space:
mode:
authorGravatar Berthold Stoeger <bstoeger@mail.tuwien.ac.at>2018-08-01 11:01:26 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2018-08-01 06:30:00 -0700
commit1c4a859c8d0b37b2e938209fe9c4d99e9758327a (patch)
tree06fc2083228ae3e40d47f09d3ee4a7ffd28f0d42 /desktop-widgets/preferences
parent42aae8196f4c2114b7418d344dd2d33287f18070 (diff)
downloadsubsurface-1c4a859c8d0b37b2e938209fe9c4d99e9758327a.tar.gz
Cleanup: remove all override modifiers
Commit df156a56c08a56eb380711a507ef739d8150a71f replaced "virtual" by "override" where appropriate. Unfortunately, this had the unintended consequence of producing numerous clang warnings. If clang finds a override-modified function in a class definition, it warns for *all* overriden virtual functions without the override modifier. To solve this, go the easy route and remove all overrides. At least it is consistent. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
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 47ae4a5e5..78150247c 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() override;
- void syncSettings() override;
+ void refreshSettings();
+ void syncSettings();
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 a24603bc2..237281349 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() override;
- void syncSettings() override;
+ void refreshSettings();
+ void syncSettings();
private:
Ui::PreferencesGeoreference *ui;
};
diff --git a/desktop-widgets/preferences/preferences_graph.h b/desktop-widgets/preferences/preferences_graph.h
index 4fc9cd5b3..c63a0372e 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() override;
- void syncSettings() override;
+ void refreshSettings();
+ void syncSettings();
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 a62d4d3dc..8f3d14d52 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() override;
- void syncSettings() override;
+ void refreshSettings();
+ void syncSettings();
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 f4b2125aa..58a1757cb 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() override;
- void syncSettings() override;
+ void refreshSettings();
+ void syncSettings();
public slots:
void proxyType_changed(int i);
diff --git a/desktop-widgets/preferences/preferences_units.h b/desktop-widgets/preferences/preferences_units.h
index 1f276d178..bf2bcf043 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() override;
- void syncSettings() override;
+ void refreshSettings();
+ void syncSettings();
private:
Ui::PreferencesUnits *ui;
};