summaryrefslogtreecommitdiffstats
path: root/qt-models/models.h
diff options
context:
space:
mode:
authorGravatar Berthold Stoeger <bstoeger@mail.tuwien.ac.at>2018-08-01 11:01:26 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2018-08-01 06:30:00 -0700
commit1c4a859c8d0b37b2e938209fe9c4d99e9758327a (patch)
tree06fc2083228ae3e40d47f09d3ee4a7ffd28f0d42 /qt-models/models.h
parent42aae8196f4c2114b7418d344dd2d33287f18070 (diff)
downloadsubsurface-1c4a859c8d0b37b2e938209fe9c4d99e9758327a.tar.gz
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 <bstoeger@mail.tuwien.ac.at>
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 f45c5e614..6140e702d 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 override;
+ QVariant data(const QModelIndex &index, int role) const;
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 override;
+ QVariant data(const QModelIndex &index, int role) const;
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 override;
- int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
+ int rowCount(const QModelIndex &parent = QModelIndex()) const;
private:
LanguageModel(QObject *parent = 0);