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/diveplotdatamodel.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'qt-models/diveplotdatamodel.h') diff --git a/qt-models/diveplotdatamodel.h b/qt-models/diveplotdatamodel.h index 51dc44176..39074c7ac 100644 --- a/qt-models/diveplotdatamodel.h +++ b/qt-models/diveplotdatamodel.h @@ -72,10 +72,10 @@ public: COLUMNS }; explicit DivePlotDataModel(QObject *parent = 0); - virtual int columnCount(const QModelIndex &parent = QModelIndex()) const; - virtual QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const; - virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; - virtual int rowCount(const QModelIndex &parent = QModelIndex()) const; + int columnCount(const QModelIndex &parent = QModelIndex()) const override; + QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; void clear(); void setDive(struct dive *d, const plot_info &pInfo); const plot_info &data() const; -- cgit v1.2.3-70-g09d2