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/windows/npcdialog.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/gui/windows/npcdialog.h') diff --git a/src/gui/windows/npcdialog.h b/src/gui/windows/npcdialog.h index beaee8afa..fa3e52097 100644 --- a/src/gui/windows/npcdialog.h +++ b/src/gui/windows/npcdialog.h @@ -75,7 +75,7 @@ class NpcDialog final : public Window, ~NpcDialog(); - void postInit() final; + void postInit() override final; enum NpcInputState { @@ -99,7 +99,7 @@ class NpcDialog final : public Window, /** * Called when receiving actions from the widgets. */ - void action(const ActionEvent &event) final; + void action(const ActionEvent &event) override final; /** * Sets the text shows in the dialog. @@ -140,17 +140,17 @@ class NpcDialog final : public Window, /** * Returns the number of items in the choices list. */ - int getNumberOfElements() final A_WARN_UNUSED; + int getNumberOfElements() override final A_WARN_UNUSED; /** * Returns the name of item number i of the choices list. */ - std::string getElementAt(int i) final A_WARN_UNUSED; + std::string getElementAt(int i) override final A_WARN_UNUSED; /** * Returns the image of item number i of the choices list. */ - const Image *getImageAt(int i) final A_WARN_UNUSED; + const Image *getImageAt(int i) override final A_WARN_UNUSED; /** * Makes this dialog request a choice selection from the user. @@ -194,9 +194,9 @@ class NpcDialog final : public Window, void move(const int amount); - void setVisible(Visible visible) final; + void setVisible(Visible visible) override final; - void optionChanged(const std::string &name) final; + void optionChanged(const std::string &name) override final; /** * Returns true if any instances exist. @@ -232,11 +232,11 @@ class NpcDialog final : public Window, void setAvatarAction(const int actionId); - void logic() final; + void logic() override final; void clearRows(); - void mousePressed(MouseEvent &event) final; + void mousePressed(MouseEvent &event) override final; int isCloseState() const { return mActionState == NPC_ACTION_CLOSE; } -- cgit v1.2.3-60-g2f50