summaryrefslogtreecommitdiffstats
path: root/qt-models/models.h
diff options
context:
space:
mode:
authorGravatar Berthold Stoeger <bstoeger@mail.tuwien.ac.at>2018-09-29 22:13:44 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2018-09-29 15:23:25 -0700
commit574065b31430245a66808561b1b95139c4cd19f2 (patch)
tree844736a0bf6969af96953db49d247123ff92f787 /qt-models/models.h
parentd7e3d68f368a2febcc17b436e097a97a7c0f8ad3 (diff)
downloadsubsurface-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/models.h')
-rw-r--r--qt-models/models.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/qt-models/models.h b/qt-models/models.h
index 6140e702d..f45c5e614 100644
--- a/qt-models/models.h
+++ b/qt-models/models.h
@@ -27,7 +27,7 @@ class GasSelectionModel : public QStringListModel {
public:
static GasSelectionModel *instance();
Qt::ItemFlags flags(const QModelIndex &index) const;
- QVariant data(const QModelIndex &index, int role) const;
+ QVariant data(const QModelIndex &index, int role) const override;
public
slots:
void repopulate();
@@ -38,7 +38,7 @@ class DiveTypeSelectionModel : public QStringListModel {
public:
static DiveTypeSelectionModel *instance();
Qt::ItemFlags flags(const QModelIndex &index) const;
- QVariant data(const QModelIndex &index, int role) const;
+ QVariant data(const QModelIndex &index, int role) const override;
public
slots:
void repopulate();
@@ -49,8 +49,8 @@ class LanguageModel : public QAbstractListModel {
Q_OBJECT
public:
static LanguageModel *instance();
- QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
- int rowCount(const QModelIndex &parent = QModelIndex()) const;
+ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+ int rowCount(const QModelIndex &parent = QModelIndex()) const override;
private:
LanguageModel(QObject *parent = 0);