From 574065b31430245a66808561b1b95139c4cd19f2 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Sat, 29 Sep 2018 22:13:44 +0200 Subject: Cleanup: reinstate override modifiers This reverts commit 1c4a859c8d0b37b2e938209fe9c4d99e9758327a, where the override modifiers were removed owing to the noisy "inconsistent override modifiers" which is default-on in clang. This warning was disabled in 77577f717f5aad38ea8c4c41c10c181486c4337f, so we can reinstate the overrides. Signed-off-by: Berthold Stoeger Signed-off-by: Dirk Hohndel --- profile-widget/diveprofileitem.h | 50 ++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 25 deletions(-) (limited to 'profile-widget/diveprofileitem.h') diff --git a/profile-widget/diveprofileitem.h b/profile-widget/diveprofileitem.h index f09c101d1..36f6e5980 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); - void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex()); + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) override; + void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex()) override; void settingsToggled(bool toggled); - void settingsChanged(); + void settingsChanged() override; 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()); - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); + void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex()) override; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) override; 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()); - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); + void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex()) override; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) override; 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); - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); + void modelDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) override; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; 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); - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); + void modelDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) override; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; private: QString visibilityKey; @@ -139,8 +139,8 @@ class DiveAmbPressureItem : public AbstractProfilePolygonItem { Q_OBJECT public: DiveAmbPressureItem(); - void modelDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight); - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); + void modelDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) override; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; private: QString visibilityKey; @@ -150,8 +150,8 @@ class DiveGFLineItem : public AbstractProfilePolygonItem { Q_OBJECT public: DiveGFLineItem(); - void modelDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight); - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); + void modelDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) override; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; private: QString visibilityKey; @@ -161,8 +161,8 @@ class DiveGasPressureItem : public AbstractProfilePolygonItem { Q_OBJECT public: - void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex()); - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); + void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex()) override; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) override; 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()); - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); - void settingsChanged(); + 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; public slots: @@ -195,8 +195,8 @@ class DiveReportedCeiling : public AbstractProfilePolygonItem { public: DiveReportedCeiling(); - void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex()); - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); + void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex()) override; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) override; }; class DiveCalculatedTissue : public DiveCalculatedCeiling { @@ -204,15 +204,15 @@ class DiveCalculatedTissue : public DiveCalculatedCeiling { public: DiveCalculatedTissue(ProfileWidget2 *profileWidget); void setVisible(bool visible); - void settingsChanged(); + void settingsChanged() override; }; class PartialPressureGasItem : public AbstractProfilePolygonItem { Q_OBJECT public: PartialPressureGasItem(); - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); - void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex()); + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) override; + void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex()) override; void setThresholdSettingsKey(const double *prefPointerMin, const double *prefPointerMax); void setVisibilitySettingsKey(const QString &setVisibilitySettingsKey); void setColors(const QColor &normalColor, const QColor &alertColor); -- cgit v1.2.3-70-g09d2