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 --- desktop-widgets/tab-widgets/TabDiveExtraInfo.h | 4 ++-- desktop-widgets/tab-widgets/TabDiveInformation.h | 4 ++-- desktop-widgets/tab-widgets/TabDivePhotos.h | 6 +++--- desktop-widgets/tab-widgets/TabDiveStatistics.h | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) (limited to 'desktop-widgets/tab-widgets') diff --git a/desktop-widgets/tab-widgets/TabDiveExtraInfo.h b/desktop-widgets/tab-widgets/TabDiveExtraInfo.h index 86ed7abbe..2b0ffc143 100644 --- a/desktop-widgets/tab-widgets/TabDiveExtraInfo.h +++ b/desktop-widgets/tab-widgets/TabDiveExtraInfo.h @@ -15,8 +15,8 @@ class TabDiveExtraInfo : public TabBase { public: TabDiveExtraInfo(QWidget *parent = 0); ~TabDiveExtraInfo(); - void updateData() override; - void clear() override; + void updateData(); + void clear(); private: Ui::TabDiveExtraInfo *ui; ExtraDataModel *extraDataModel; diff --git a/desktop-widgets/tab-widgets/TabDiveInformation.h b/desktop-widgets/tab-widgets/TabDiveInformation.h index 80579dbd1..19c2cf155 100644 --- a/desktop-widgets/tab-widgets/TabDiveInformation.h +++ b/desktop-widgets/tab-widgets/TabDiveInformation.h @@ -13,8 +13,8 @@ class TabDiveInformation : public TabBase { public: TabDiveInformation(QWidget *parent = 0); ~TabDiveInformation(); - void updateData() override; - void clear() override; + void updateData(); + void clear(); private: Ui::TabDiveInformation *ui; diff --git a/desktop-widgets/tab-widgets/TabDivePhotos.h b/desktop-widgets/tab-widgets/TabDivePhotos.h index f172df180..5298c7039 100644 --- a/desktop-widgets/tab-widgets/TabDivePhotos.h +++ b/desktop-widgets/tab-widgets/TabDivePhotos.h @@ -15,11 +15,11 @@ class TabDivePhotos : public TabBase { public: TabDivePhotos(QWidget *parent = 0); ~TabDivePhotos(); - void updateData() override; - void clear() override; + void updateData(); + void clear(); protected: - void contextMenuEvent(QContextMenuEvent *ev) override; + void contextMenuEvent(QContextMenuEvent *ev); private slots: void addPhotosFromFile(); diff --git a/desktop-widgets/tab-widgets/TabDiveStatistics.h b/desktop-widgets/tab-widgets/TabDiveStatistics.h index c763b2e88..94d2e71b0 100644 --- a/desktop-widgets/tab-widgets/TabDiveStatistics.h +++ b/desktop-widgets/tab-widgets/TabDiveStatistics.h @@ -13,8 +13,8 @@ class TabDiveStatistics : public TabBase { public: TabDiveStatistics(QWidget *parent = 0); ~TabDiveStatistics(); - void updateData() override; - void clear() override; + void updateData(); + void clear(); private: Ui::TabDiveStatistics *ui; -- cgit v1.2.3-70-g09d2