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/treemodel.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'qt-models/treemodel.h') diff --git a/qt-models/treemodel.h b/qt-models/treemodel.h index 093df4ba0..eae36c58c 100644 --- a/qt-models/treemodel.h +++ b/qt-models/treemodel.h @@ -25,12 +25,12 @@ class TreeModel : public QAbstractItemModel { Q_OBJECT public: TreeModel(QObject *parent = 0); - virtual ~TreeModel(); - virtual QVariant data(const QModelIndex &index, int role) const; - /*reimp*/ int rowCount(const QModelIndex &parent = QModelIndex()) const; - /*reimp*/ int columnCount(const QModelIndex &parent = QModelIndex()) const; - /*reimp*/ QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const; - /*reimp*/ QModelIndex parent(const QModelIndex &child) const; + ~TreeModel(); + QVariant data(const QModelIndex &index, int role) const override; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; + int columnCount(const QModelIndex &parent = QModelIndex()) const override; + QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override; + QModelIndex parent(const QModelIndex &child) const override; protected: int columns; -- cgit v1.2.3-70-g09d2