From dba0611175c8d4a56dfbc918ccef139351e5c3e0 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 17 Apr 2016 23:06:06 +0300 Subject: Revert "Remove override keyword, if it present with final." This reverts commit 55480eb4477b2cf85af1bcdcc5e8ec4f4ce6682d. --- src/gui/widgets/tabs/setuptabscroll.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/gui/widgets/tabs/setuptabscroll.h') diff --git a/src/gui/widgets/tabs/setuptabscroll.h b/src/gui/widgets/tabs/setuptabscroll.h index 5afe4ac46..30e771c05 100644 --- a/src/gui/widgets/tabs/setuptabscroll.h +++ b/src/gui/widgets/tabs/setuptabscroll.h @@ -47,23 +47,23 @@ class SetupTabScroll notfinal : public SetupTab void apply() override; - void cancel() final; + void cancel() override final; void externalUpdated() override; void externalUnloaded() override; - void action(const ActionEvent &event A_UNUSED) final + void action(const ActionEvent &event A_UNUSED) override final { } int getPreferredFirstItemSize() const A_WARN_UNUSED { return mPreferredFirstItemSize; } - void widgetResized(const Event &event) final; + void widgetResized(const Event &event) override final; void reread(const std::string &name); - void clear() final; + void clear() override final; const std::set &getAllItems() const { return mAllItems; } -- cgit v1.2.3-70-g09d2