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 --- qt-models/cylindermodel.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'qt-models/cylindermodel.h') diff --git a/qt-models/cylindermodel.h b/qt-models/cylindermodel.h index 1ec4c05ce..c97eac179 100644 --- a/qt-models/cylindermodel.h +++ b/qt-models/cylindermodel.h @@ -28,10 +28,10 @@ public: explicit CylindersModel(QObject *parent = 0); static CylindersModel *instance(); - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; - int rowCount(const QModelIndex &parent = QModelIndex()) const; - Qt::ItemFlags flags(const QModelIndex &index) const; - bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole); + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; + Qt::ItemFlags flags(const QModelIndex &index) const override; + bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override; void passInData(const QModelIndex &index, const QVariant &value); void add(); @@ -43,7 +43,7 @@ public: void moveAtFirst(int cylid); cylinder_t *cylinderAt(const QModelIndex &index); bool changed; - QVariant headerData(int section, Qt::Orientation orientation, int role) const; + QVariant headerData(int section, Qt::Orientation orientation, int role) const override; public slots: -- cgit v1.2.3-70-g09d2