From 1c4a859c8d0b37b2e938209fe9c4d99e9758327a Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Wed, 1 Aug 2018 11:01:26 +0200 Subject: 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 --- profile-widget/divepixmapitem.h | 2 +- profile-widget/diveprofileitem.h | 50 ++++++++++++++++++++-------------------- profile-widget/profilewidget2.h | 22 +++++++++--------- profile-widget/ruleritem.h | 2 +- 4 files changed, 38 insertions(+), 38 deletions(-) (limited to 'profile-widget') diff --git a/profile-widget/divepixmapitem.h b/profile-widget/divepixmapitem.h index cf5b86d7c..fc4eb1682 100644 --- a/profile-widget/divepixmapitem.h +++ b/profile-widget/divepixmapitem.h @@ -20,7 +20,7 @@ class CloseButtonItem : public DivePixmapItem { public: CloseButtonItem(QGraphicsItem *parent = 0); protected: - void mousePressEvent(QGraphicsSceneMouseEvent *event) override; + void mousePressEvent(QGraphicsSceneMouseEvent *event); public slots: void hide(); void show(); diff --git a/profile-widget/diveprofileitem.h b/profile-widget/diveprofileitem.h index d0b65dd72..3b9a49e82 100644 --- a/profile-widget/diveprofileitem.h +++ b/profile-widget/diveprofileitem.h @@ -72,10 +72,10 @@ class DiveProfileItem : public AbstractProfilePolygonItem { public: DiveProfileItem(); - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) override; - void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex()) override; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); + void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex()); void settingsToggled(bool toggled); - void settingsChanged() override; + void settingsChanged(); void plot_depth_sample(struct plot_data *entry, QFlags flags, const QColor &color); int maxCeiling(int row); @@ -89,8 +89,8 @@ class DiveMeanDepthItem : public AbstractProfilePolygonItem { Q_OBJECT public: DiveMeanDepthItem(); - void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex()) override; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) override; + void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex()); + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); private: void createTextItem(); @@ -102,8 +102,8 @@ class DiveTemperatureItem : public AbstractProfilePolygonItem { Q_OBJECT public: DiveTemperatureItem(); - void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex()) override; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) override; + void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex()); + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); private: void createTextItem(int seconds, int mkelvin); @@ -113,8 +113,8 @@ class DiveHeartrateItem : public AbstractProfilePolygonItem { Q_OBJECT public: DiveHeartrateItem(); - void modelDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) override; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; + void modelDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight); + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); private: void createTextItem(int seconds, int hr); @@ -125,8 +125,8 @@ class DivePercentageItem : public AbstractProfilePolygonItem { Q_OBJECT public: DivePercentageItem(int i); - void modelDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) override; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; + void modelDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight); + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); private: QString visibilityKey; @@ -139,8 +139,8 @@ class DiveAmbPressureItem : public AbstractProfilePolygonItem { Q_OBJECT public: DiveAmbPressureItem(); - void modelDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) override; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; + void modelDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight); + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); private: QString visibilityKey; @@ -150,8 +150,8 @@ class DiveGFLineItem : public AbstractProfilePolygonItem { Q_OBJECT public: DiveGFLineItem(); - void modelDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) override; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; + void modelDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight); + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); private: QString visibilityKey; @@ -161,8 +161,8 @@ class DiveGasPressureItem : public AbstractProfilePolygonItem { Q_OBJECT public: - void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex()) override; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) override; + void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex()); + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); private: void plotPressureValue(int mbar, int sec, QFlags align, double offset); @@ -175,9 +175,9 @@ class DiveCalculatedCeiling : public AbstractProfilePolygonItem { public: DiveCalculatedCeiling(ProfileWidget2 *profileWidget); - void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex()) override; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) override; - void settingsChanged() override; + void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex()); + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); + void settingsChanged(); public slots: @@ -195,8 +195,8 @@ class DiveReportedCeiling : public AbstractProfilePolygonItem { public: DiveReportedCeiling(); - void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex()) override; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) override; + void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex()); + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); }; class DiveCalculatedTissue : public DiveCalculatedCeiling { @@ -204,15 +204,15 @@ class DiveCalculatedTissue : public DiveCalculatedCeiling { public: DiveCalculatedTissue(ProfileWidget2 *profileWidget); void setVisible(bool visible); - void settingsChanged() override; + void settingsChanged(); }; class PartialPressureGasItem : public AbstractProfilePolygonItem { Q_OBJECT public: PartialPressureGasItem(); - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) override; - void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex()) override; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); + void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex()); void setThresholdSettingsKey(double *prefPointerMin, double *prefPointerMax); void setVisibilitySettingsKey(const QString &setVisibilitySettingsKey); void setColors(const QColor &normalColor, const QColor &alertColor); diff --git a/profile-widget/profilewidget2.h b/profile-widget/profilewidget2.h index f9fbba3b3..170019269 100644 --- a/profile-widget/profilewidget2.h +++ b/profile-widget/profilewidget2.h @@ -84,7 +84,7 @@ public: double getFontPrintScale(); void setFontPrintScale(double scale); #ifndef SUBSURFACE_MOBILE - bool eventFilter(QObject *, QEvent *) override; + bool eventFilter(QObject *, QEvent *); void clearHandlers(); #endif void recalcCeiling(); @@ -146,18 +146,18 @@ slots: // Necessary to call from QAction's signals. #endif protected: - void resizeEvent(QResizeEvent *event) override; + void resizeEvent(QResizeEvent *event); #ifndef SUBSURFACE_MOBILE - void wheelEvent(QWheelEvent *event) override; - void mouseMoveEvent(QMouseEvent *event) override; - void contextMenuEvent(QContextMenuEvent *event) override; - void mouseDoubleClickEvent(QMouseEvent *event) override; - void mousePressEvent(QMouseEvent *event) override; - void mouseReleaseEvent(QMouseEvent *event) override; + void wheelEvent(QWheelEvent *event); + void mouseMoveEvent(QMouseEvent *event); + void contextMenuEvent(QContextMenuEvent *event); + void mouseDoubleClickEvent(QMouseEvent *event); + void mousePressEvent(QMouseEvent *event); + void mouseReleaseEvent(QMouseEvent *event); #endif - void dropEvent(QDropEvent *event) override; - void dragEnterEvent(QDragEnterEvent *event) override; - void dragMoveEvent(QDragMoveEvent *event) override; + void dropEvent(QDropEvent *event); + void dragEnterEvent(QDragEnterEvent *event); + void dragMoveEvent(QDragMoveEvent *event); private: /*methods*/ diff --git a/profile-widget/ruleritem.h b/profile-widget/ruleritem.h index 3a6c59480..1fdb959a2 100644 --- a/profile-widget/ruleritem.h +++ b/profile-widget/ruleritem.h @@ -22,7 +22,7 @@ public: void recalculate(); protected: - void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override; + void mouseMoveEvent(QGraphicsSceneMouseEvent *event); private: struct plot_info pInfo; struct plot_data *entry; -- cgit v1.2.3-70-g09d2