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: remove all override modifiers

Browse source 
Commit df156a56c0 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>
This commit is contained in:
Berthold Stoeger 2018-08-01 11:01:26 +02:00 • committed by Dirk Hohndel
parent 42aae8196f
commit 1c4a859c8d
49 changed files with 199 additions and 199 deletions
Download patch file Download diff file Expand all files Collapse all files

2
desktop-widgets/btdeviceselectiondialog.h
View file

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

12
desktop-widgets/configuredivecomputerdialog.h
View file

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

4
desktop-widgets/divelistview.h
View file

@ -45,8 +45,8 @@ slots:
void removeFromTrip();
void deleteDive();
void markDiveInvalid();
void rowsInserted(const QModelIndex &parent, int start, int end) override;
void reset() override;
void rowsInserted(const QModelIndex &parent, int start, int end);
void reset();
void mergeTripAbove();
void mergeTripBelow();
void newTripAbove();

6
desktop-widgets/divepicturewidget.h
View file

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

8
desktop-widgets/groupedlineedit.h
View file

@ -55,15 +55,15 @@ public:
void addColor(QColor color);
QSize sizeHint() const override;
QSize minimumSizeHint() const override;
QSize sizeHint() const;
QSize minimumSizeHint() const;
signals:
void editingFinished();
protected:
void paintEvent(QPaintEvent *e) override;
void keyPressEvent(QKeyEvent *e) override;
void paintEvent(QPaintEvent *e);
void keyPressEvent(QKeyEvent *e);
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 override;
QSize sizeHint() const;
/**
* Returns the minimum size of the message widget.
*/
QSize minimumSizeHint() const override;
QSize minimumSizeHint() const;
/**
* Returns the required height for @p width.
* @param width the width in pixels
*/
int heightForWidth(int width) const override;
int heightForWidth(int width) const;
/**
* 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) override;
void paintEvent(QPaintEvent *event);
bool event(QEvent *event) override;
bool event(QEvent *event);
void resizeEvent(QResizeEvent *event) override;
void resizeEvent(QResizeEvent *event);
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);
bool eventFilter(QObject*, QEvent*) override;
bool eventFilter(QObject*, QEvent*);
protected:
void showEvent(QShowEvent *);
@ -56,8 +56,8 @@ class DiveLocationFilterProxyModel : public QSortFilterProxyModel {
Q_OBJECT
public:
DiveLocationFilterProxyModel(QObject *parent = 0);
bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const override;
bool lessThan(const QModelIndex& source_left, const QModelIndex& source_right) const override;
bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const;
bool lessThan(const QModelIndex& source_left, const QModelIndex& source_right) const;
};
class DiveLocationModel : public QAbstractTableModel {
@ -79,7 +79,7 @@ class DiveLocationListView : public QListView {
public:
DiveLocationListView(QWidget *parent = 0);
protected:
void currentChanged(const QModelIndex& current, const QModelIndex& previous) override;
void currentChanged(const QModelIndex& current, const QModelIndex& previous);
signals:
void currentIndexChanged(const QModelIndex& current);
};

38
desktop-widgets/modeldelegates.h
View file

@ -19,8 +19,8 @@ class StarWidgetsDelegate : public QStyledItemDelegate {
Q_OBJECT
public:
explicit StarWidgetsDelegate(QWidget *parent = 0);
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override;
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const;
QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const;
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);
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;
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const;
void setEditorData(QWidget *editor, const QModelIndex &index) const;
void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index) const;
bool eventFilter(QObject *object, QEvent *event);
public
slots:
void testActivation(const QString &currString = QString());
@ -54,8 +54,8 @@ class TankInfoDelegate : public ComboBoxDelegate {
Q_OBJECT
public:
explicit TankInfoDelegate(QObject *parent = 0);
void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override;
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const;
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const;
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);
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;
void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const;
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const;
void setEditorData(QWidget * editor, const QModelIndex & index) const;
};
class WSInfoDelegate : public ComboBoxDelegate {
Q_OBJECT
public:
explicit WSInfoDelegate(QObject *parent = 0);
void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override;
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const;
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const;
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);
void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override;
void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const;
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);
void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override;
void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const;
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);
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const;
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);
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const;
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 override;
QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override;
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const;
QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const;
};
#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);
bool isConnected() override;
void requestLogin() override;
void requestLogoff() override;
QString socialNetworkIcon() const override;
QString socialNetworkName() const override;
void requestUpload() override;
bool isConnected();
void requestLogin();
void requestLogoff();
QString socialNetworkIcon() const;
QString socialNetworkName() const;
void requestUpload();
private:
FacebookConnectWidget *fbConnectWidget;
};

4
desktop-widgets/preferences/preferences_defaults.h
View file

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

4
desktop-widgets/preferences/preferences_georeference.h
View file

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

4
desktop-widgets/preferences/preferences_graph.h
View file

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

4
desktop-widgets/preferences/preferences_language.h
View file

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

4
desktop-widgets/preferences/preferences_network.h
View file

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

4
desktop-widgets/preferences/preferences_units.h
View file

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

6
desktop-widgets/simplewidgets.h
View file

@ -172,8 +172,8 @@ protected:
FilterBase(FilterModelBase *model, QWidget *parent = 0);
FilterModelBase *model;
Ui::FilterWidget ui;
void showEvent(QShowEvent *) override;
void hideEvent(QHideEvent *) override;
void showEvent(QShowEvent *);
void hideEvent(QHideEvent *);
friend class MultiFilter;
};
@ -201,7 +201,7 @@ class TextHyperlinkEventFilter : public QObject {
public:
explicit TextHyperlinkEventFilter(QTextEdit *txtEdit);
bool eventFilter(QObject *target, QEvent *evt) override;
bool eventFilter(QObject *target, QEvent *evt);
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;
QSize sizeHint() const override;
QSize sizeHint() const;
static const QImage& starActive();
static const QImage& starInactive();
@ -28,11 +28,11 @@ slots:
void setReadOnly(bool readOnly);
protected:
void mouseReleaseEvent(QMouseEvent *) override;
void paintEvent(QPaintEvent *) override;
void focusInEvent(QFocusEvent *) override;
void focusOutEvent(QFocusEvent *) override;
void keyPressEvent(QKeyEvent *) override;
void mouseReleaseEvent(QMouseEvent *);
void paintEvent(QPaintEvent *);
void focusInEvent(QFocusEvent *);
void focusOutEvent(QFocusEvent *);
void keyPressEvent(QKeyEvent *);
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:
void resizeEvent(QResizeEvent *event) override;
void resizeEvent(QResizeEvent *event);
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
void startDownload() override { }
void startUpload() override { }
void buttonClicked(QAbstractButton *button) override { Q_UNUSED(button) }
void startDownload() { }
void startUpload() { }
void buttonClicked(QAbstractButton *button) { Q_UNUSED(button) }
};
#endif // SUBSURFACEWEBSERVICES_H

4
desktop-widgets/tab-widgets/TabDiveExtraInfo.h
View file

@ -15,8 +15,8 @@ class TabDiveExtraInfo : public TabBase {
public:
TabDiveExtraInfo(QWidget *parent = 0);
~TabDiveExtraInfo();
void updateData() override;
void clear() override;
void updateData();
void clear();
private:
Ui::TabDiveExtraInfo *ui;
ExtraDataModel *extraDataModel;

4
desktop-widgets/tab-widgets/TabDiveInformation.h
View file

@ -13,8 +13,8 @@ class TabDiveInformation : public TabBase {
public:
TabDiveInformation(QWidget *parent = 0);
~TabDiveInformation();
void updateData() override;
void clear() override;
void updateData();
void clear();
private:
Ui::TabDiveInformation *ui;

6
desktop-widgets/tab-widgets/TabDivePhotos.h
View file

@ -15,11 +15,11 @@ class TabDivePhotos : public TabBase {
public:
TabDivePhotos(QWidget *parent = 0);
~TabDivePhotos();
void updateData() override;
void clear() override;
void updateData();
void clear();
protected:
void contextMenuEvent(QContextMenuEvent *ev) override;
void contextMenuEvent(QContextMenuEvent *ev);
private slots:
void addPhotosFromFile();

4
desktop-widgets/tab-widgets/TabDiveStatistics.h
View file

@ -13,8 +13,8 @@ class TabDiveStatistics : public TabBase {
public:
TabDiveStatistics(QWidget *parent = 0);
~TabDiveStatistics();
void updateData() override;
void clear() override;
void updateData();
void clear();
private:
Ui::TabDiveStatistics *ui;

4
desktop-widgets/tableview.h
View file

@ -40,8 +40,8 @@ public:
QTableView *view();
protected:
void showEvent(QShowEvent *) override;
void resizeEvent(QResizeEvent *) override;
void showEvent(QShowEvent *);
void resizeEvent(QResizeEvent *);
signals:
void addButtonClicked();

16
desktop-widgets/undocommands.h
View file

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