diff options
author | Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2018-07-31 07:41:19 +0200 |
---|---|---|
committer | Tomaz Canabrava <tcanabrava@kde.org> | 2018-07-31 11:02:34 +0200 |
commit | df156a56c08a56eb380711a507ef739d8150a71f (patch) | |
tree | 0d0da57857fff1ba844c84fbc5de2e6cd872cb1e /qt-models/treemodel.h | |
parent | 7fe76a5dbdef4a833122e0311191dd51896575f4 (diff) | |
download | subsurface-df156a56c08a56eb380711a507ef739d8150a71f.tar.gz |
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 <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'qt-models/treemodel.h')
-rw-r--r-- | qt-models/treemodel.h | 12 |
1 files changed, 6 insertions, 6 deletions
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; |