mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup: replace virtual by override where appropriate

Browse source 
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>
This commit is contained in:
Berthold Stoeger 2018-07-31 07:41:19 +02:00 • committed by Tomaz Canabrava
parent 7fe76a5dbd
commit df156a56c0
49 changed files with 200 additions and 203 deletions
Download patch file Download diff file Expand all files Collapse all files

12
qt-models/divetripmodel.h
View file

@ -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);