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>
This commit is contained in:
Berthold Stoeger 2018-07-31 07:41:19 +02:00 committed by Tomaz Canabrava
parent 7fe76a5dbd
commit df156a56c0
49 changed files with 200 additions and 203 deletions

View file

@ -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);

View file

@ -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;
};

View file

@ -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);

View file

@ -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;

View file

@ -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);

View file

@ -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;
};

View file

@ -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();