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/setupbuttonitem.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/gui/widgets/setupbuttonitem.h') diff --git a/src/gui/widgets/setupbuttonitem.h b/src/gui/widgets/setupbuttonitem.h index a23699f51..c0d6005cd 100644 --- a/src/gui/widgets/setupbuttonitem.h +++ b/src/gui/widgets/setupbuttonitem.h @@ -43,23 +43,23 @@ class SetupButtonItem final : public SetupItem void createControls(); - void fromWidget() final A_CONST; + void fromWidget() override final A_CONST; - void toWidget() final A_CONST; + void toWidget() override final A_CONST; - void action(const ActionEvent &event) final A_CONST; + void action(const ActionEvent &event) override final A_CONST; - void apply(const std::string &eventName) final A_CONST; + void apply(const std::string &eventName) override final A_CONST; void cancel(const std::string &eventName A_UNUSED) - final A_CONST; + override final A_CONST; void externalUpdated(const std::string &eventName A_UNUSED) - final A_CONST; + override final A_CONST; - void rereadValue() final A_CONST; + void rereadValue() override final A_CONST; - void save() final A_CONST; + void save() override final A_CONST; protected: HorizontContainer *mHorizont; -- cgit v1.2.3-60-g2f50