From 55480eb4477b2cf85af1bcdcc5e8ec4f4ce6682d Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 17 Apr 2016 20:03:14 +0300 Subject: Remove override keyword, if it present with final. --- src/listeners/awaylistener.h | 2 +- src/listeners/charrenamelistener.h | 2 +- src/listeners/errorlistener.h | 2 +- src/listeners/guiconfiglistener.h | 2 +- src/listeners/guitableactionlistener.h | 2 +- src/listeners/inputactionremotelistener.h | 2 +- src/listeners/inputactionreplaylistener.h | 2 +- src/listeners/insertcardlistener.h | 2 +- src/listeners/openurllistener.h | 2 +- src/listeners/pincodelistener.h | 2 +- src/listeners/playerlistener.h | 2 +- src/listeners/playerpostdeathlistener.h | 2 +- src/listeners/renamelistener.h | 2 +- src/listeners/requestadoptchildlistener.h | 2 +- src/listeners/requesttradelistener.h | 2 +- src/listeners/shoprenamelistener.h | 2 +- src/listeners/skillwarplistener.h | 2 +- src/listeners/textskilllistener.h | 2 +- src/listeners/uploadlistener.h | 2 +- src/listeners/weightlistener.h | 2 +- src/listeners/wrongdatanoticelistener.h | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) (limited to 'src/listeners') diff --git a/src/listeners/awaylistener.h b/src/listeners/awaylistener.h index 0592286de..d53ea72ea 100644 --- a/src/listeners/awaylistener.h +++ b/src/listeners/awaylistener.h @@ -28,7 +28,7 @@ class AwayListener final : public ActionListener { public: - void action(const ActionEvent &event) override final; + void action(const ActionEvent &event) final; }; #endif // LISTENERS_AWAYLISTENER_H diff --git a/src/listeners/charrenamelistener.h b/src/listeners/charrenamelistener.h index 60300fee6..a466fff6b 100644 --- a/src/listeners/charrenamelistener.h +++ b/src/listeners/charrenamelistener.h @@ -36,7 +36,7 @@ class CharRenameListener final : public ActionListener A_DELETE_COPY(CharRenameListener) - void action(const ActionEvent &event) override final; + void action(const ActionEvent &event) final; void setId(const BeingId id) { mId = id; } diff --git a/src/listeners/errorlistener.h b/src/listeners/errorlistener.h index b7fa03b83..3c73bb9be 100644 --- a/src/listeners/errorlistener.h +++ b/src/listeners/errorlistener.h @@ -30,7 +30,7 @@ class ErrorListener final : public ActionListener { public: - void action(const ActionEvent &event) override final; + void action(const ActionEvent &event) final; }; extern ErrorListener errorListener; diff --git a/src/listeners/guiconfiglistener.h b/src/listeners/guiconfiglistener.h index b487a056b..f2d84e0b4 100644 --- a/src/listeners/guiconfiglistener.h +++ b/src/listeners/guiconfiglistener.h @@ -45,7 +45,7 @@ class GuiConfigListener final : public ConfigListener CHECKLISTENERS } - void optionChanged(const std::string &name) override final + void optionChanged(const std::string &name) final { if (!mGui) return; diff --git a/src/listeners/guitableactionlistener.h b/src/listeners/guitableactionlistener.h index b6fba25c7..a6cc1bb33 100644 --- a/src/listeners/guitableactionlistener.h +++ b/src/listeners/guitableactionlistener.h @@ -41,7 +41,7 @@ class GuiTableActionListener final : public ActionListener ~GuiTableActionListener(); - void action(const ActionEvent& actionEvent) override final; + void action(const ActionEvent& actionEvent) final; protected: GuiTable *mTable; diff --git a/src/listeners/inputactionremotelistener.h b/src/listeners/inputactionremotelistener.h index 7fbaf76a7..52a66588b 100644 --- a/src/listeners/inputactionremotelistener.h +++ b/src/listeners/inputactionremotelistener.h @@ -32,7 +32,7 @@ class InputActionRemoteListener final : public ActionListener A_DELETE_COPY(InputActionRemoteListener) - void action(const ActionEvent &event) override final; + void action(const ActionEvent &event) final; void setCommand(const std::string &command, const std::string &args) diff --git a/src/listeners/inputactionreplaylistener.h b/src/listeners/inputactionreplaylistener.h index d2294f4c4..3dcf17eac 100644 --- a/src/listeners/inputactionreplaylistener.h +++ b/src/listeners/inputactionreplaylistener.h @@ -36,7 +36,7 @@ class InputActionReplayListener final : public ActionListener A_DELETE_COPY(InputActionReplayListener) - void action(const ActionEvent &event) override final; + void action(const ActionEvent &event) final; void setDialog(EditDialog *const dialog) { mDialog = dialog; } diff --git a/src/listeners/insertcardlistener.h b/src/listeners/insertcardlistener.h index a7c962f96..ab8664cdc 100644 --- a/src/listeners/insertcardlistener.h +++ b/src/listeners/insertcardlistener.h @@ -41,7 +41,7 @@ struct InsertCardListener final : public ActionListener A_DELETE_COPY(InsertCardListener) public: - void action(const ActionEvent &event) override final + void action(const ActionEvent &event) final { if (event.getId() == "yes" && inventoryHandler) inventoryHandler->insertCard(cardIndex, itemIndex); diff --git a/src/listeners/openurllistener.h b/src/listeners/openurllistener.h index e7b275b69..e44e11455 100644 --- a/src/listeners/openurllistener.h +++ b/src/listeners/openurllistener.h @@ -40,7 +40,7 @@ struct OpenUrlListener final : public ActionListener A_DELETE_COPY(OpenUrlListener) public: - void action(const ActionEvent &event) override final + void action(const ActionEvent &event) final { if (event.getId() == "yes") openBrowser(url); diff --git a/src/listeners/pincodelistener.h b/src/listeners/pincodelistener.h index 8921b9a70..4cd23009d 100644 --- a/src/listeners/pincodelistener.h +++ b/src/listeners/pincodelistener.h @@ -30,7 +30,7 @@ class PincodeListener final : public ActionListener { public: - void action(const ActionEvent &event) override final; + void action(const ActionEvent &event) final; }; extern PincodeListener pincodeListener; diff --git a/src/listeners/playerlistener.h b/src/listeners/playerlistener.h index 84d582c3f..dab59ae0e 100644 --- a/src/listeners/playerlistener.h +++ b/src/listeners/playerlistener.h @@ -36,7 +36,7 @@ class PlayerListener final : public ActionListener A_DELETE_COPY(PlayerListener) - void action(const ActionEvent &event) override final; + void action(const ActionEvent &event) final; void setNick(const std::string &name) { mNick = name; } diff --git a/src/listeners/playerpostdeathlistener.h b/src/listeners/playerpostdeathlistener.h index cebdc3700..eae139314 100644 --- a/src/listeners/playerpostdeathlistener.h +++ b/src/listeners/playerpostdeathlistener.h @@ -41,7 +41,7 @@ extern OkDialog *deathNotice; */ struct PlayerPostDeathListener final : public ActionListener { - void action(const ActionEvent &event A_UNUSED) override final + void action(const ActionEvent &event A_UNUSED) final { if (playerHandler) playerHandler->respawn(); diff --git a/src/listeners/renamelistener.h b/src/listeners/renamelistener.h index 2b6abdc4a..88eb6c58c 100644 --- a/src/listeners/renamelistener.h +++ b/src/listeners/renamelistener.h @@ -35,7 +35,7 @@ class RenameListener final : public ActionListener A_DELETE_COPY(RenameListener) - void action(const ActionEvent &event) override final; + void action(const ActionEvent &event) final; void setMapItem(const MapItem *const mapItem); diff --git a/src/listeners/requestadoptchildlistener.h b/src/listeners/requestadoptchildlistener.h index 9d90fae75..5ccebf097 100644 --- a/src/listeners/requestadoptchildlistener.h +++ b/src/listeners/requestadoptchildlistener.h @@ -32,7 +32,7 @@ struct RequestAdoptChildListener final : public ActionListener { public: - void action(const ActionEvent &event) override final + void action(const ActionEvent &event) final { const std::string &eventId = event.getId(); familyHandler->askForChildReply(eventId == "yes"); diff --git a/src/listeners/requesttradelistener.h b/src/listeners/requesttradelistener.h index 576e22cfb..babfecfb8 100644 --- a/src/listeners/requesttradelistener.h +++ b/src/listeners/requesttradelistener.h @@ -40,7 +40,7 @@ extern ConfirmDialog *confirmDlg; struct RequestTradeListener final : public ActionListener { public: - void action(const ActionEvent &event) override final + void action(const ActionEvent &event) final { confirmDlg = nullptr; const std::string &eventId = event.getId(); diff --git a/src/listeners/shoprenamelistener.h b/src/listeners/shoprenamelistener.h index 5ca3fcbd6..147db8288 100644 --- a/src/listeners/shoprenamelistener.h +++ b/src/listeners/shoprenamelistener.h @@ -36,7 +36,7 @@ class ShopRenameListener final : public ActionListener A_DELETE_COPY(ShopRenameListener) - void action(const ActionEvent &event) override final; + void action(const ActionEvent &event) final; void setDialog(EditDialog *const dialog) { mDialog = dialog; } diff --git a/src/listeners/skillwarplistener.h b/src/listeners/skillwarplistener.h index f7f2f230d..2694dab0f 100644 --- a/src/listeners/skillwarplistener.h +++ b/src/listeners/skillwarplistener.h @@ -36,7 +36,7 @@ class SkillWarpListener final : public ActionListener A_DELETE_COPY(SkillWarpListener) - void action(const ActionEvent &event) override final; + void action(const ActionEvent &event) final; void setDialog(TextSelectDialog *const dialog) { mDialog = dialog; } diff --git a/src/listeners/textskilllistener.h b/src/listeners/textskilllistener.h index 68a6d3d72..787eabca1 100644 --- a/src/listeners/textskilllistener.h +++ b/src/listeners/textskilllistener.h @@ -34,7 +34,7 @@ class TextSkillListener final : public ActionListener A_DELETE_COPY(TextSkillListener) - void action(const ActionEvent &event) override final; + void action(const ActionEvent &event) final; void setSkill(const int skillId, const int x, diff --git a/src/listeners/uploadlistener.h b/src/listeners/uploadlistener.h index a1bdaf944..0eafac7f7 100644 --- a/src/listeners/uploadlistener.h +++ b/src/listeners/uploadlistener.h @@ -30,7 +30,7 @@ class UploadListener final : public ActionListener { public: - void action(const ActionEvent &event A_UNUSED) override final; + void action(const ActionEvent &event A_UNUSED) final; }; extern UploadListener uploadListener; diff --git a/src/listeners/weightlistener.h b/src/listeners/weightlistener.h index 6c2e39335..4b0d1caab 100644 --- a/src/listeners/weightlistener.h +++ b/src/listeners/weightlistener.h @@ -35,7 +35,7 @@ extern OkDialog *weightNotice; struct WeightListener final : public ActionListener { public: - void action(const ActionEvent &event A_UNUSED) override final + void action(const ActionEvent &event A_UNUSED) final { weightNotice = nullptr; } diff --git a/src/listeners/wrongdatanoticelistener.h b/src/listeners/wrongdatanoticelistener.h index b54536657..85ad78e9c 100644 --- a/src/listeners/wrongdatanoticelistener.h +++ b/src/listeners/wrongdatanoticelistener.h @@ -41,7 +41,7 @@ class WrongDataNoticeListener final : public ActionListener void setTarget(TextField *const textField); - void action(const ActionEvent &event) override final; + void action(const ActionEvent &event) final; private: TextField *mTarget; }; -- cgit v1.2.3-60-g2f50