mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup: replace virtual by override where appropriate

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

4
desktop-widgets/btdeviceselectiondialog.h
View file

@ -39,8 +39,8 @@ public:
bool isActive() const;
QString errorToString() const;
QBluetoothDeviceDiscoveryAgent::Error error() const;
virtual void run();
virtual void stop();
void run() override;
void stop();
private:
bool running;

12
desktop-widgets/configuredivecomputerdialog.h
View file

@ -26,9 +26,9 @@ public:
GasSpinBoxItemDelegate(QObject *parent = 0, column_type type = PERCENT);
~GasSpinBoxItemDelegate();
virtual QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const;
virtual void setEditorData(QWidget *editor, const QModelIndex &index) const;
virtual void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const;
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
void setEditorData(QWidget *editor, const QModelIndex &index) const override;
void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override;
private:
column_type type;
@ -46,9 +46,9 @@ public:
GasTypeComboBoxItemDelegate(QObject *parent = 0, computer_type type = OSTC3);
~GasTypeComboBoxItemDelegate();
virtual QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const;
virtual void setEditorData(QWidget *editor, const QModelIndex &index) const;
virtual void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const;
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
void setEditorData(QWidget *editor, const QModelIndex &index) const override;
void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override;
private:
computer_type type;

6
desktop-widgets/divepicturewidget.h
View file

@ -12,9 +12,9 @@ class DivePictureWidget : public QListView {
public:
DivePictureWidget(QWidget *parent);
protected:
void mouseDoubleClickEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
void wheelEvent(QWheelEvent *event) Q_DECL_OVERRIDE;
void mouseDoubleClickEvent(QMouseEvent *event) override;
void mousePressEvent(QMouseEvent *event) override;
void wheelEvent(QWheelEvent *event) override;
signals:
void photoDoubleClicked(const QString filePath);

2
desktop-widgets/diveplanner.h
View file

@ -67,7 +67,7 @@ class PlannerSettingsWidget : public QWidget {
Q_OBJECT
public:
explicit PlannerSettingsWidget(QWidget *parent = 0, Qt::WindowFlags f = 0);
virtual ~PlannerSettingsWidget();
~PlannerSettingsWidget();
public
slots:
void settingsChanged();

10
desktop-widgets/groupedlineedit.h
View file

@ -39,7 +39,7 @@ class GroupedLineEdit : public QPlainTextEdit {
public:
explicit GroupedLineEdit(QWidget *parent = 0);
virtual ~GroupedLineEdit();
~GroupedLineEdit();
QString text() const;
@ -55,15 +55,15 @@ public:
void addColor(QColor color);
virtual QSize sizeHint() const;
virtual QSize minimumSizeHint() const;
QSize sizeHint() const override;
QSize minimumSizeHint() const override;
signals:
void editingFinished();
protected:
virtual void paintEvent(QPaintEvent *e);
virtual void keyPressEvent(QKeyEvent *e);
void paintEvent(QPaintEvent *e) override;
void keyPressEvent(QKeyEvent *e) override;
private:
struct Private;

12
desktop-widgets/kmessagewidget.h
View file

@ -186,18 +186,18 @@ public:
/**
* Returns the preferred size of the message widget.
*/
QSize sizeHint() const Q_DECL_OVERRIDE;
QSize sizeHint() const override;
/**
* Returns the minimum size of the message widget.
*/
QSize minimumSizeHint() const Q_DECL_OVERRIDE;
QSize minimumSizeHint() const override;
/**
* Returns the required height for @p width.
* @param width the width in pixels
*/
int heightForWidth(int width) const Q_DECL_OVERRIDE;
int heightForWidth(int width) const override;
/**
* The icon shown on the left of the text. By default, no icon is shown.
@ -326,11 +326,11 @@ Q_SIGNALS:
void showAnimationFinished();
protected:
void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE;
void paintEvent(QPaintEvent *event) override;
bool event(QEvent *event) Q_DECL_OVERRIDE;
bool event(QEvent *event) override;
void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE;
void resizeEvent(QResizeEvent *event) override;
private:
KMessageWidgetPrivate *const d;

8
desktop-widgets/locationinformation.h
View file

@ -11,7 +11,7 @@ class LocationInformationWidget : public QGroupBox {
Q_OBJECT
public:
LocationInformationWidget(QWidget *parent = 0);
virtual bool eventFilter(QObject*, QEvent*);
bool eventFilter(QObject*, QEvent*) override;
protected:
void showEvent(QShowEvent *);
@ -56,8 +56,8 @@ class DiveLocationFilterProxyModel : public QSortFilterProxyModel {
Q_OBJECT
public:
DiveLocationFilterProxyModel(QObject *parent = 0);
virtual bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const;
virtual bool lessThan(const QModelIndex& source_left, const QModelIndex& source_right) const;
bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const override;
bool lessThan(const QModelIndex& source_left, const QModelIndex& source_right) const override;
};
class DiveLocationModel : public QAbstractTableModel {
@ -79,7 +79,7 @@ class DiveLocationListView : public QListView {
public:
DiveLocationListView(QWidget *parent = 0);
protected:
virtual void currentChanged(const QModelIndex& current, const QModelIndex& previous);
void currentChanged(const QModelIndex& current, const QModelIndex& previous) override;
signals:
void currentIndexChanged(const QModelIndex& current);
};

2
desktop-widgets/mainwindow.h
View file

@ -58,7 +58,7 @@ public:
};
MainWindow();
virtual ~MainWindow();
~MainWindow();
static MainWindow *instance();
MainTab *information();
void loadRecentFiles();

38
desktop-widgets/modeldelegates.h
View file

@ -19,8 +19,8 @@ class StarWidgetsDelegate : public QStyledItemDelegate {
Q_OBJECT
public:
explicit StarWidgetsDelegate(QWidget *parent = 0);
virtual void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const;
virtual QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const;
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override;
const QSize& starSize() const;
private:
@ -32,10 +32,10 @@ class ComboBoxDelegate : public QStyledItemDelegate {
Q_OBJECT
public:
explicit ComboBoxDelegate(QAbstractItemModel *model, QObject *parent = 0, bool allowEdit = true);
virtual QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const;
virtual void setEditorData(QWidget *editor, const QModelIndex &index) const;
virtual void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index) const;
virtual bool eventFilter(QObject *object, QEvent *event);
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
void setEditorData(QWidget *editor, const QModelIndex &index) const override;
void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
bool eventFilter(QObject *object, QEvent *event) override;
public
slots:
void testActivation(const QString &currString = QString());
@ -54,8 +54,8 @@ class TankInfoDelegate : public ComboBoxDelegate {
Q_OBJECT
public:
explicit TankInfoDelegate(QObject *parent = 0);
virtual void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const;
virtual QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const;
void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override;
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
public
slots:
void revertModelData(QWidget *widget, QAbstractItemDelegate::EndEditHint hint);
@ -66,17 +66,17 @@ class TankUseDelegate : public QStyledItemDelegate {
Q_OBJECT
public:
explicit TankUseDelegate(QObject *parent = 0);
virtual void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const;
virtual QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const;
virtual void setEditorData(QWidget * editor, const QModelIndex & index) const;
void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override;
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
void setEditorData(QWidget * editor, const QModelIndex & index) const override;
};
class WSInfoDelegate : public ComboBoxDelegate {
Q_OBJECT
public:
explicit WSInfoDelegate(QObject *parent = 0);
virtual void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const;
virtual QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const;
void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override;
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
public
slots:
void revertModelData(QWidget *widget, QAbstractItemDelegate::EndEditHint hint);
@ -86,7 +86,7 @@ class AirTypesDelegate : public ComboBoxDelegate {
Q_OBJECT
public:
explicit AirTypesDelegate(QObject *parent = 0);
virtual void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const;
void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override;
public
slots:
void revertModelData(QWidget *widget, QAbstractItemDelegate::EndEditHint hint);
@ -96,7 +96,7 @@ class DiveTypesDelegate : public ComboBoxDelegate {
Q_OBJECT
public:
explicit DiveTypesDelegate(QObject *parent = 0);
virtual void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const;
void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override;
public
slots:
void revertModelData(QWidget *widget, QAbstractItemDelegate::EndEditHint hint);
@ -106,7 +106,7 @@ class SpinBoxDelegate : public QStyledItemDelegate {
Q_OBJECT
public:
SpinBoxDelegate(int min, int max, int step, QObject *parent = 0);
virtual QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const;
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
private:
int min;
int max;
@ -117,7 +117,7 @@ class DoubleSpinBoxDelegate : public QStyledItemDelegate {
Q_OBJECT
public:
DoubleSpinBoxDelegate(double min, double max, double step, QObject *parent = 0);
virtual QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const;
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
private:
double min;
double max;
@ -128,8 +128,8 @@ class LocationFilterDelegate : public QStyledItemDelegate {
Q_OBJECT
public:
LocationFilterDelegate(QObject *parent = 0);
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const Q_DECL_OVERRIDE;
QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const Q_DECL_OVERRIDE;
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override;
};
#endif // MODELDELEGATES_H

12
desktop-widgets/plugins/facebook/facebook_integration.h
View file

@ -13,12 +13,12 @@ class FacebookPlugin : public ISocialNetworkIntegration {
Q_OBJECT
public:
explicit FacebookPlugin(QObject* parent = 0);
virtual bool isConnected();
virtual void requestLogin();
virtual void requestLogoff();
virtual QString socialNetworkIcon() const;
virtual QString socialNetworkName() const;
virtual void requestUpload();
bool isConnected() override;
void requestLogin() override;
void requestLogoff() override;
QString socialNetworkIcon() const override;
QString socialNetworkName() const override;
void requestUpload() override;
private:
FacebookConnectWidget *fbConnectWidget;
};

6
desktop-widgets/preferences/preferences_defaults.h
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);

6
desktop-widgets/preferences/preferences_georeference.h
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;
};

6
desktop-widgets/preferences/preferences_graph.h
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);

6
desktop-widgets/preferences/preferences_language.h
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;

6
desktop-widgets/preferences/preferences_network.h
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);

6
desktop-widgets/preferences/preferences_units.h
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;
};

2
desktop-widgets/preferences/preferencesdialog.h
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();

2
desktop-widgets/printdialog.h
View file

@ -19,7 +19,7 @@ class PrintDialog : public QDialog {
public:
explicit PrintDialog(QWidget *parent = 0, Qt::WindowFlags f = 0);
virtual ~PrintDialog();
~PrintDialog();
private:
PrintOptions *optionsWidget;

6
desktop-widgets/simplewidgets.h
View file

@ -172,8 +172,8 @@ protected:
FilterBase(FilterModelBase *model, QWidget *parent = 0);
FilterModelBase *model;
Ui::FilterWidget ui;
virtual void showEvent(QShowEvent *);
virtual void hideEvent(QHideEvent *);
void showEvent(QShowEvent *) override;
void hideEvent(QHideEvent *) override;
friend class MultiFilter;
};
@ -201,7 +201,7 @@ class TextHyperlinkEventFilter : public QObject {
public:
explicit TextHyperlinkEventFilter(QTextEdit *txtEdit);
virtual bool eventFilter(QObject *target, QEvent *evt);
bool eventFilter(QObject *target, QEvent *evt) override;
private:
void handleUrlClick(const QString &urlStr);

12
desktop-widgets/starwidget.h
View file

@ -14,7 +14,7 @@ public:
explicit StarWidget(QWidget *parent = 0, Qt::WindowFlags f = 0);
int currentStars() const;
/*reimp*/ QSize sizeHint() const;
QSize sizeHint() const override;
static const QImage& starActive();
static const QImage& starInactive();
@ -28,11 +28,11 @@ slots:
void setReadOnly(bool readOnly);
protected:
/*reimp*/ void mouseReleaseEvent(QMouseEvent *);
/*reimp*/ void paintEvent(QPaintEvent *);
/*reimp*/ void focusInEvent(QFocusEvent *);
/*reimp*/ void focusOutEvent(QFocusEvent *);
/*reimp*/ void keyPressEvent(QKeyEvent *);
void mouseReleaseEvent(QMouseEvent *) override;
void paintEvent(QPaintEvent *) override;
void focusInEvent(QFocusEvent *) override;
void focusOutEvent(QFocusEvent *) override;
void keyPressEvent(QKeyEvent *) override;
private:
int current;

2
desktop-widgets/statistics/statisticswidget.h
View file

@ -13,7 +13,7 @@ public:
YearlyStatisticsWidget(QWidget *parent = 0);
void setModel(YearlyStatisticsModel *m);
protected:
virtual void resizeEvent(QResizeEvent *event);
void resizeEvent(QResizeEvent *event) override;
public slots:
void modelRowsInserted(const QModelIndex& index, int first, int last);
void modelDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight);

6
desktop-widgets/subsurfacewebservices.h
View file

@ -105,9 +105,9 @@ public:
private
slots:
// need to declare them as no ops or Qt4 is unhappy
virtual void startDownload() { }
virtual void startUpload() { }
virtual void buttonClicked(QAbstractButton *button) { Q_UNUSED(button) }
void startDownload() override { }
void startUpload() override { }
void buttonClicked(QAbstractButton *button) override { Q_UNUSED(button) }
};
#endif // SUBSURFACEWEBSERVICES_H

6
desktop-widgets/tableview.h
View file

@ -27,7 +27,7 @@ class TableView : public QGroupBox {
};
public:
TableView(QWidget *parent = 0);
virtual ~TableView();
~TableView();
/* The model is expected to have a 'remove' slot, that takes a QModelIndex as parameter.
* It's also expected to have the column '1' as a trash icon. I most probably should create a
* proxy model and add that column, will mark that as TODO. see? marked.
@ -40,8 +40,8 @@ public:
QTableView *view();
protected:
virtual void showEvent(QShowEvent *);
virtual void resizeEvent(QResizeEvent *);
void showEvent(QShowEvent *) override;
void resizeEvent(QResizeEvent *) override;
signals:
void addButtonClicked();

16
desktop-widgets/undocommands.h
View file

@ -8,8 +8,8 @@
class UndoDeleteDive : public QUndoCommand {
public:
UndoDeleteDive(QList<struct dive*> deletedDives);
virtual void undo();
virtual void redo();
void undo() override;
void redo() override;
private:
QList<struct dive*> diveList;
@ -19,8 +19,8 @@ private:
class UndoShiftTime : public QUndoCommand {
public:
UndoShiftTime(QList<int> changedDives, int amount);
virtual void undo();
virtual void redo();
void undo() override;
void redo() override;
private:
QList<int> diveList;
@ -30,8 +30,8 @@ private:
class UndoRenumberDives : public QUndoCommand {
public:
UndoRenumberDives(QMap<int, QPair<int, int> > originalNumbers);
virtual void undo();
virtual void redo();
void undo() override;
void redo() override;
private:
QMap<int,QPair<int, int> > oldNumbers;
@ -40,8 +40,8 @@ private:
class UndoRemoveDivesFromTrip : public QUndoCommand {
public:
UndoRemoveDivesFromTrip(QMap<struct dive*, dive_trip*> removedDives);
virtual void undo();
virtual void redo();
void undo() override;
void redo() override;
private:
QMap<struct dive*, dive_trip*> divesToUndo;