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>

1 files changed, 6 insertions, 6 deletions

diff --git a/qt-models/divetripmodel.h b/qt-models/divetripmodel.h
index 0d1cff5a0..78951e5bd 100644
--- a/qt-models/divetripmodel.h
+++ b/qt-models/divetripmodel.h
@@ -30,10 +30,10 @@ public:
 		COLUMNS
 	};
 
-	virtual QVariant data(int column, int role) const;
+	QVariant data(int column, int role) const override;
 	int diveId;
-	virtual bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);
-	virtual Qt::ItemFlags flags(const QModelIndex &index) const;
+	bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
+	Qt::ItemFlags flags(const QModelIndex &index) const override;
 	QString displayDate() const;
 	QString displayDuration() const;
 	QString displayDepth() const;
@@ -52,7 +52,7 @@ public:
 struct TripItem : public TreeItem {
 	Q_DECLARE_TR_FUNCTIONS(TripItem)
 public:
-	virtual QVariant data(int column, int role) const;
+	QVariant data(int column, int role) const override;
 	dive_trip_t *trip;
 };
 
@@ -94,8 +94,8 @@ public:
 	};
 
 	Qt::ItemFlags flags(const QModelIndex &index) const;
-	virtual QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
-	virtual bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);
+	QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
+	bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
 	DiveTripModel(QObject *parent = 0);
 	Layout layout() const;
 	void setLayout(Layout layout);