Cleanup: replace virtual by override where appropriate

The keyword "virtual" signalizes that the function is virtual,
i.e. the function of the derived class is called, even if the
call is on the parent class.

It is not necessary to repeat the "virtual" keyword in derived
classes. To highlight derived virtual functions, the keyword
"override" should be used instead. It results in a hard compile-
error, if no function is overridden, thus avoiding subtle bugs.

Replace "virtual" by "override" where appropriate. Moreover,
replace Q_DECL_OVERRIDE by override, since we require reasonably
recent compilers anyway. Likewise, replace /* reimp */ by
"override" for consistency and compiler support.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>

7 files changed, 19 insertions, 19 deletions

diff --git a/desktop-widgets/preferences/preferences_defaults.h b/desktop-widgets/preferences/preferences_defaults.h
index d7bb7db7f..47ae4a5e5 100644
--- a/desktop-widgets/preferences/preferences_defaults.h
+++ b/desktop-widgets/preferences/preferences_defaults.h
@@ -13,9 +13,9 @@ class PreferencesDefaults : public AbstractPreferencesWidget {
 	Q_OBJECT
 public:
 	PreferencesDefaults();
-	virtual ~PreferencesDefaults();
-	virtual void refreshSettings();
-	virtual void syncSettings();
+	~PreferencesDefaults();
+	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 8f76294cd..a24603bc2 100644
--- a/desktop-widgets/preferences/preferences_georeference.h
+++ b/desktop-widgets/preferences/preferences_georeference.h
@@ -12,9 +12,9 @@ class PreferencesGeoreference : public AbstractPreferencesWidget {
 	Q_OBJECT
 public:
 	PreferencesGeoreference();
-	virtual ~PreferencesGeoreference();
-	virtual void refreshSettings();
-	virtual void syncSettings();
+	~PreferencesGeoreference();
+	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 d38275729..4fc9cd5b3 100644
--- a/desktop-widgets/preferences/preferences_graph.h
+++ b/desktop-widgets/preferences/preferences_graph.h
@@ -12,9 +12,9 @@ class PreferencesGraph : public AbstractPreferencesWidget {
 	Q_OBJECT
 public:
 	PreferencesGraph();
-	virtual ~PreferencesGraph();
-	virtual void refreshSettings();
-	virtual void syncSettings();
+	~PreferencesGraph();
+	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 4ff268b87..a62d4d3dc 100644
--- a/desktop-widgets/preferences/preferences_language.h
+++ b/desktop-widgets/preferences/preferences_language.h
@@ -13,9 +13,9 @@ class PreferencesLanguage : public AbstractPreferencesWidget {
 	Q_OBJECT
 public:
 	PreferencesLanguage();
-	virtual ~PreferencesLanguage();
-	virtual void refreshSettings();
-	virtual void syncSettings();
+	~PreferencesLanguage();
+	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 844cce3f0..f4b2125aa 100644
--- a/desktop-widgets/preferences/preferences_network.h
+++ b/desktop-widgets/preferences/preferences_network.h
@@ -13,9 +13,9 @@ class PreferencesNetwork : public AbstractPreferencesWidget {
 
 public:
 	PreferencesNetwork();
-	virtual ~PreferencesNetwork();
-	virtual void refreshSettings();
-	virtual void syncSettings();
+	~PreferencesNetwork();
+	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 fb20588a2..1f276d178 100644
--- a/desktop-widgets/preferences/preferences_units.h
+++ b/desktop-widgets/preferences/preferences_units.h
@@ -12,9 +12,9 @@ class PreferencesUnits : public AbstractPreferencesWidget {
 	Q_OBJECT
 public:
 	PreferencesUnits();
-	virtual ~PreferencesUnits();
-	virtual void refreshSettings();
-	virtual void syncSettings();
+	~PreferencesUnits();
+	void refreshSettings() override;
+	void syncSettings() override;
 private:
 	Ui::PreferencesUnits *ui;
 };
diff --git a/desktop-widgets/preferences/preferencesdialog.h b/desktop-widgets/preferences/preferencesdialog.h
index 34d542b03..2a1b53315 100644
--- a/desktop-widgets/preferences/preferencesdialog.h
+++ b/desktop-widgets/preferences/preferencesdialog.h
@@ -15,7 +15,7 @@ class PreferencesDialog : public QDialog {
 	Q_OBJECT
 public:
 	static PreferencesDialog* instance();
-	virtual ~PreferencesDialog();
+	~PreferencesDialog();
 	void addPreferencePage(AbstractPreferencesWidget *page);
 	void refreshPages();
 	void emitSettingsChanged();