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 --- qt-models/divetripmodel.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'qt-models/divetripmodel.h') diff --git a/qt-models/divetripmodel.h b/qt-models/divetripmodel.h index 78951e5bd..fc17aff92 100644 --- a/qt-models/divetripmodel.h +++ b/qt-models/divetripmodel.h @@ -30,10 +30,10 @@ public: COLUMNS }; - QVariant data(int column, int role) const override; + QVariant data(int column, int role) const; int diveId; - bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override; - Qt::ItemFlags flags(const QModelIndex &index) const override; + bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole); + Qt::ItemFlags flags(const QModelIndex &index) const; QString displayDate() const; QString displayDuration() const; QString displayDepth() const; @@ -52,7 +52,7 @@ public: struct TripItem : public TreeItem { Q_DECLARE_TR_FUNCTIONS(TripItem) public: - QVariant data(int column, int role) const override; + QVariant data(int column, int role) const; dive_trip_t *trip; }; @@ -94,8 +94,8 @@ public: }; Qt::ItemFlags flags(const QModelIndex &index) const; - QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; - bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override; + QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const; + bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole); DiveTripModel(QObject *parent = 0); Layout layout() const; void setLayout(Layout layout); -- cgit v1.2.3-70-g09d2