From df156a56c08a56eb380711a507ef739d8150a71f Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Tue, 31 Jul 2018 07:41:19 +0200 Subject: Cleanup: replace virtual by override where appropriate The keyword "virtual" signalizes that the function is virtual, i.e. the function of the derived class is called, even if the call is on the parent class. It is not necessary to repeat the "virtual" keyword in derived classes. To highlight derived virtual functions, the keyword "override" should be used instead. It results in a hard compile- error, if no function is overridden, thus avoiding subtle bugs. Replace "virtual" by "override" where appropriate. Moreover, replace Q_DECL_OVERRIDE by override, since we require reasonably recent compilers anyway. Likewise, replace /* reimp */ by "override" for consistency and compiler support. Signed-off-by: Berthold Stoeger --- qt-models/tankinfomodel.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'qt-models/tankinfomodel.h') diff --git a/qt-models/tankinfomodel.h b/qt-models/tankinfomodel.h index 944757b1a..7f79a466b 100644 --- a/qt-models/tankinfomodel.h +++ b/qt-models/tankinfomodel.h @@ -18,10 +18,10 @@ public: }; TankInfoModel(); - /*reimp*/ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; - /*reimp*/ int rowCount(const QModelIndex &parent = QModelIndex()) const; - /*reimp*/ bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex()); - /*reimp*/ 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; + bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex()) override; + bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override; const QString &biggerString() const; void clear(); public -- cgit v1.2.3-70-g09d2