diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2018-09-29 22:13:44 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-09-29 15:23:25 -0700 |
| commit | 574065b31430245a66808561b1b95139c4cd19f2 (patch) | |
| tree | 844736a0bf6969af96953db49d247123ff92f787 /qt-models/divetripmodel.h | |
| parent | d7e3d68f368a2febcc17b436e097a97a7c0f8ad3 (diff) | |
| download | subsurface-574065b31430245a66808561b1b95139c4cd19f2.tar.gz | |
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 <bstoeger@mail.tuwien.ac.at>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-models/divetripmodel.h')
| -rw-r--r-- | qt-models/divetripmodel.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/qt-models/divetripmodel.h b/qt-models/divetripmodel.h index 700ae4c12..4164c5788 100644 --- a/qt-models/divetripmodel.h +++ b/qt-models/divetripmodel.h @@ -31,10 +31,10 @@ public: COLUMNS }; - QVariant data(int column, int role) const; + QVariant data(int column, int role) const override; int diveId; - bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole); - Qt::ItemFlags flags(const QModelIndex &index) const; + bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override; + Qt::ItemFlags flags(const QModelIndex &index) const override; QString displayDate() const; QString displayDuration() const; QString displayDepth() const; @@ -53,7 +53,7 @@ public: struct TripItem : public TreeItem { Q_DECLARE_TR_FUNCTIONS(TripItem) public: - QVariant data(int column, int role) const; + QVariant data(int column, int role) const override; dive_trip_t *trip; }; @@ -97,8 +97,8 @@ public: static DiveTripModel *instance(); Qt::ItemFlags flags(const QModelIndex &index) const; - QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const; - bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole); + 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; DiveTripModel(QObject *parent = 0); Layout layout() const; void setLayout(Layout layout); |