From 574065b31430245a66808561b1b95139c4cd19f2 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Sat, 29 Sep 2018 22:13:44 +0200 Subject: Cleanup: reinstate override modifiers This reverts commit 1c4a859c8d0b37b2e938209fe9c4d99e9758327a, where the override modifiers were removed owing to the noisy "inconsistent override modifiers" which is default-on in clang. This warning was disabled in 77577f717f5aad38ea8c4c41c10c181486c4337f, so we can reinstate the overrides. Signed-off-by: Berthold Stoeger Signed-off-by: Dirk Hohndel --- 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 2b0ffc143..86ed7abbe 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(); - void clear(); + void updateData() override; + void clear() override; private: Ui::TabDiveExtraInfo *ui; ExtraDataModel *extraDataModel; diff --git a/desktop-widgets/tab-widgets/TabDiveInformation.h b/desktop-widgets/tab-widgets/TabDiveInformation.h index 19c2cf155..80579dbd1 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(); - void clear(); + void updateData() override; + void clear() override; private: Ui::TabDiveInformation *ui; diff --git a/desktop-widgets/tab-widgets/TabDivePhotos.h b/desktop-widgets/tab-widgets/TabDivePhotos.h index 5298c7039..f172df180 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(); - void clear(); + void updateData() override; + void clear() override; protected: - void contextMenuEvent(QContextMenuEvent *ev); + void contextMenuEvent(QContextMenuEvent *ev) override; private slots: void addPhotosFromFile(); diff --git a/desktop-widgets/tab-widgets/TabDiveStatistics.h b/desktop-widgets/tab-widgets/TabDiveStatistics.h index 94d2e71b0..c763b2e88 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(); - void clear(); + void updateData() override; + void clear() override; private: Ui::TabDiveStatistics *ui; -- cgit v1.2.3-70-g09d2