From 1c4a859c8d0b37b2e938209fe9c4d99e9758327a Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Wed, 1 Aug 2018 11:01:26 +0200 Subject: Cleanup: remove all override modifiers Commit df156a56c08a56eb380711a507ef739d8150a71f replaced "virtual" by "override" where appropriate. Unfortunately, this had the unintended consequence of producing numerous clang warnings. If clang finds a override-modified function in a class definition, it warns for *all* overriden virtual functions without the override modifier. To solve this, go the easy route and remove all overrides. At least it is consistent. Signed-off-by: Berthold Stoeger --- qt-models/divepicturemodel.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'qt-models/divepicturemodel.h') diff --git a/qt-models/divepicturemodel.h b/qt-models/divepicturemodel.h index 6c9384c62..a1e117c39 100644 --- a/qt-models/divepicturemodel.h +++ b/qt-models/divepicturemodel.h @@ -20,9 +20,9 @@ class DivePictureModel : public QAbstractTableModel { Q_OBJECT public: static DivePictureModel *instance(); - int columnCount(const QModelIndex &parent = QModelIndex()) const override; - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; - int rowCount(const QModelIndex &parent = QModelIndex()) const override; + int columnCount(const QModelIndex &parent = QModelIndex()) const; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; + int rowCount(const QModelIndex &parent = QModelIndex()) const; void updateDivePictures(); void removePictures(const QVector &fileUrls); void updateDivePictureOffset(int diveId, const QString &filename, int offsetSeconds); -- cgit v1.2.3-70-g09d2