From 1814650ad896a0f9684d279fa5843771e767748a Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 24 Oct 2013 12:17:35 +0300 Subject: add final keyword to net files. --- src/net/tmwa/adminhandler.h | 10 +++++----- src/net/tmwa/beinghandler.h | 6 +++--- src/net/tmwa/charserverhandler.h | 14 +++++++------- src/net/tmwa/chathandler.h | 14 +++++++------- src/net/tmwa/gamehandler.h | 18 +++++++++--------- src/net/tmwa/generalhandler.h | 18 +++++++++--------- src/net/tmwa/guildhandler.h | 26 ++++++++++++++------------ src/net/tmwa/inventoryhandler.h | 19 +++++++++++-------- src/net/tmwa/itemhandler.h | 2 +- src/net/tmwa/loginhandler.h | 19 ++++++++++--------- src/net/tmwa/npchandler.h | 25 +++++++++++++------------ src/net/tmwa/partyhandler.h | 22 +++++++++++----------- src/net/tmwa/playerhandler.h | 26 +++++++++++++------------- src/net/tmwa/questhandler.h | 2 +- src/net/tmwa/skillhandler.h | 8 ++++---- src/net/tmwa/tradehandler.h | 17 +++++++++-------- 16 files changed, 127 insertions(+), 119 deletions(-) (limited to 'src/net/tmwa') diff --git a/src/net/tmwa/adminhandler.h b/src/net/tmwa/adminhandler.h index 1f339e485..72c23cc4a 100644 --- a/src/net/tmwa/adminhandler.h +++ b/src/net/tmwa/adminhandler.h @@ -37,15 +37,15 @@ class AdminHandler final : public MessageHandler, public Ea::AdminHandler A_DELETE_COPY(AdminHandler) - void handleMessage(Net::MessageIn &msg) override; + void handleMessage(Net::MessageIn &msg) override final; - void announce(const std::string &text) const override; + void announce(const std::string &text) const override final; - void localAnnounce(const std::string &text) const override; + void localAnnounce(const std::string &text) const override final; - void hide(const bool h) const override; + void hide(const bool h) const override final; - void kick(const int playerId) const override; + void kick(const int playerId) const override final; }; } // namespace TmwAthena diff --git a/src/net/tmwa/beinghandler.h b/src/net/tmwa/beinghandler.h index 6f863feed..5507fc2f7 100644 --- a/src/net/tmwa/beinghandler.h +++ b/src/net/tmwa/beinghandler.h @@ -37,11 +37,11 @@ class BeingHandler final : public MessageHandler, public Ea::BeingHandler A_DELETE_COPY(BeingHandler) - void handleMessage(Net::MessageIn &msg) override; + void handleMessage(Net::MessageIn &msg) override final; - void requestNameById(const int id) const override; + void requestNameById(const int id) const override final; - void undress(Being *const being) const override; + void undress(Being *const being) const override final; protected: void processBeingChangeLook(Net::MessageIn &msg, diff --git a/src/net/tmwa/charserverhandler.h b/src/net/tmwa/charserverhandler.h index 2f9ac21d6..3a8f75ab0 100644 --- a/src/net/tmwa/charserverhandler.h +++ b/src/net/tmwa/charserverhandler.h @@ -41,28 +41,28 @@ class CharServerHandler final : public MessageHandler, A_DELETE_COPY(CharServerHandler) - void handleMessage(Net::MessageIn &msg) override; + void handleMessage(Net::MessageIn &msg) override final; - void chooseCharacter(Net::Character *const character) override; + void chooseCharacter(Net::Character *const character) override final; void newCharacter(const std::string &name, const int slot, const bool gender, const int hairstyle, const int hairColor, const unsigned char race, const unsigned char look, - const std::vector &stats) const override; + const std::vector &stats) const override final; - void deleteCharacter(Net::Character *const character) override; + void deleteCharacter(Net::Character *const character) override final; - void switchCharacter() const override; + void switchCharacter() const override final; - void connect() override; + void connect() override final; void processCharLogin(Net::MessageIn &msg); protected: void readPlayerData(Net::MessageIn &msg, Net::Character *const character, - const bool withColors) const override; + const bool withColors) const override final; }; } // namespace TmwAthena diff --git a/src/net/tmwa/chathandler.h b/src/net/tmwa/chathandler.h index 6da3a8eef..a21c0afe1 100644 --- a/src/net/tmwa/chathandler.h +++ b/src/net/tmwa/chathandler.h @@ -38,23 +38,23 @@ class ChatHandler final : public MessageHandler, public Ea::ChatHandler A_DELETE_COPY(ChatHandler) - void handleMessage(Net::MessageIn &msg) override; + void handleMessage(Net::MessageIn &msg) override final; void talk(const std::string &text, - const std::string &channel) const override; + const std::string &channel) const override final; - void talkRaw(const std::string &text) const override; + void talkRaw(const std::string &text) const override final; void privateMessage(const std::string &recipient, - const std::string &text) override; + const std::string &text) override final; - void who() const override; + void who() const override final; void sendRaw(const std::string &args) const; - void ignoreAll() const override; + void ignoreAll() const override final; - void unIgnoreAll() const override; + void unIgnoreAll() const override final; static void processRaw(MessageOut &outMsg, const std::string &line); }; diff --git a/src/net/tmwa/gamehandler.h b/src/net/tmwa/gamehandler.h index b38db877c..6be2084d7 100644 --- a/src/net/tmwa/gamehandler.h +++ b/src/net/tmwa/gamehandler.h @@ -37,23 +37,23 @@ class GameHandler final : public MessageHandler, public Ea::GameHandler A_DELETE_COPY(GameHandler) - void handleMessage(Net::MessageIn &msg) override; + void handleMessage(Net::MessageIn &msg) override final; - void connect() override; + void connect() override final; - bool isConnected() const override A_WARN_UNUSED; + bool isConnected() const override final A_WARN_UNUSED; - void disconnect() override; + void disconnect() override final; - void quit() const override; + void quit() const override final; - void ping(const int tick) const override; + void ping(const int tick) const override final; - void disconnect2() const override; + void disconnect2() const override final; - void mapLoadedEvent() const override; + void mapLoadedEvent() const override final; - bool mustPing() const override A_WARN_UNUSED + bool mustPing() const override final A_WARN_UNUSED { return false; } }; diff --git a/src/net/tmwa/generalhandler.h b/src/net/tmwa/generalhandler.h index 47ca0081a..24b17c6f5 100644 --- a/src/net/tmwa/generalhandler.h +++ b/src/net/tmwa/generalhandler.h @@ -40,23 +40,23 @@ class GeneralHandler final : public MessageHandler, ~GeneralHandler(); - void handleMessage(Net::MessageIn &msg) override; + void handleMessage(Net::MessageIn &msg) override final; - void load() override; + void load() override final; - void reload() override; + void reload() override final; - void unload() override; + void unload() override final; - void flushNetwork() override; + void flushNetwork() override final; - void clearHandlers() override; + void clearHandlers() override final; - void reloadPartially() const override; + void reloadPartially() const override final; - void gameStarted() const override; + void gameStarted() const override final; - void gameEnded() const override; + void gameEnded() const override final; protected: MessageHandlerPtr mAdminHandler; diff --git a/src/net/tmwa/guildhandler.h b/src/net/tmwa/guildhandler.h index d2238ff83..ea4c0f182 100644 --- a/src/net/tmwa/guildhandler.h +++ b/src/net/tmwa/guildhandler.h @@ -38,34 +38,36 @@ class GuildHandler final : public Ea::GuildHandler, public MessageHandler ~GuildHandler(); - void handleMessage(Net::MessageIn &msg) override; + void handleMessage(Net::MessageIn &msg) override final; - void create(const std::string &name) const override; + void create(const std::string &name) const override final; - void invite(const int guildId, const std::string &name) const override; + void invite(const int guildId, + const std::string &name) const override final; void invite(const int guildId, - const Being *const being) const override; + const Being *const being) const override final; void inviteResponse(const int guildId, - const bool response) const override; + const bool response) const override final; - void leave(const int guildId) const override; + void leave(const int guildId) const override final; void kick(const GuildMember *const member, - const std::string &reason) const override; + const std::string &reason) const override final; - void chat(const int guildId, const std::string &text) const override; + void chat(const int guildId, + const std::string &text) const override final; - void memberList(const int guildId) const override; + void memberList(const int guildId) const override final; - void info(const int guildId) override; + void info(const int guildId) override final; void changeMemberPostion(const GuildMember *const member, - const int level) const override; + const int level) const override final; void changeNotice(const int guildId, const std::string &msg1, - const std::string &msg2) const override; + const std::string &msg2) const override final; }; extern Ea::GuildTab *guildTab; diff --git a/src/net/tmwa/inventoryhandler.h b/src/net/tmwa/inventoryhandler.h index 9d7e877cf..a23e05b93 100644 --- a/src/net/tmwa/inventoryhandler.h +++ b/src/net/tmwa/inventoryhandler.h @@ -40,20 +40,23 @@ class InventoryHandler final : public MessageHandler, ~InventoryHandler(); - void handleMessage(Net::MessageIn &msg) override; + void handleMessage(Net::MessageIn &msg) override final; - void equipItem(const Item *const item) const override; + void equipItem(const Item *const item) const override final; - void unequipItem(const Item *const item) const override; + void unequipItem(const Item *const item) const override final; - void useItem(const Item *const item) const override; + void useItem(const Item *const item) const override final; - void dropItem(const Item *const item, const int amount) const override; + void dropItem(const Item *const item, + const int amount) const override final; - void closeStorage(const int type) const override; + void closeStorage(const int type) const override final; - void moveItem2(const int source, const int slot, - const int amount, const int destination) const override; + void moveItem2(const int source, + const int slot, + const int amount, + const int destination) const override final; }; } // namespace TmwAthena diff --git a/src/net/tmwa/itemhandler.h b/src/net/tmwa/itemhandler.h index d77ae64b7..e377e18a7 100644 --- a/src/net/tmwa/itemhandler.h +++ b/src/net/tmwa/itemhandler.h @@ -37,7 +37,7 @@ class ItemHandler final : public MessageHandler, public Ea::ItemHandler A_DELETE_COPY(ItemHandler) - void handleMessage(Net::MessageIn &msg) override; + void handleMessage(Net::MessageIn &msg) override final; }; } // namespace TmwAthena diff --git a/src/net/tmwa/loginhandler.h b/src/net/tmwa/loginhandler.h index 30a0bd286..8eabcfe56 100644 --- a/src/net/tmwa/loginhandler.h +++ b/src/net/tmwa/loginhandler.h @@ -41,24 +41,25 @@ class LoginHandler final : public MessageHandler, public Ea::LoginHandler ~LoginHandler(); - void handleMessage(Net::MessageIn &msg) override; + void handleMessage(Net::MessageIn &msg) override final; - void connect() override; + void connect() override final; - bool isConnected() const override A_WARN_UNUSED; + bool isConnected() const override final A_WARN_UNUSED; - void disconnect() override; + void disconnect() override final; - int supportedOptionalActions() const override A_WARN_UNUSED; + int supportedOptionalActions() const override final A_WARN_UNUSED; - unsigned int getMaxPasswordLength() const override A_WARN_UNUSED + unsigned int getMaxPasswordLength() const override final A_WARN_UNUSED { return 24; } void changePassword(const std::string &username, const std::string &oldPassword, - const std::string &newPassword) const override; + const std::string &newPassword) + const override final; - ServerInfo *getCharServer() const override A_WARN_UNUSED; + ServerInfo *getCharServer() const override final A_WARN_UNUSED; void processServerVersion(Net::MessageIn &msg); @@ -69,7 +70,7 @@ class LoginHandler final : public MessageHandler, public Ea::LoginHandler private: void sendLoginRegister(const std::string &username, const std::string &password, - const std::string &email) const override; + const std::string &email) const override final; }; } // namespace TmwAthena diff --git a/src/net/tmwa/npchandler.h b/src/net/tmwa/npchandler.h index 52d77b769..50238cdf7 100644 --- a/src/net/tmwa/npchandler.h +++ b/src/net/tmwa/npchandler.h @@ -37,35 +37,36 @@ class NpcHandler final : public MessageHandler, public Ea::NpcHandler A_DELETE_COPY(NpcHandler) - void handleMessage(Net::MessageIn &msg) override; + void handleMessage(Net::MessageIn &msg) override final; - void talk(const int npcId) const override; + void talk(const int npcId) const override final; - void nextDialog(const int npcId) const override; + void nextDialog(const int npcId) const override final; - void closeDialog(const int npcId) override; + void closeDialog(const int npcId) override final; void listInput(const int npcId, - const unsigned char value) const override; + const unsigned char value) const override final; - void integerInput(const int npcId, const int value) const override; + void integerInput(const int npcId, + const int value) const override final; void stringInput(const int npcId, - const std::string &value) const override; + const std::string &value) const override final; - void buy(const int beingId) const override; + void buy(const int beingId) const override final; - void sell(const int beingId) const override; + void sell(const int beingId) const override final; void buyItem(const int beingId, const int itemId, const unsigned char color, - const int amount) const override; + const int amount) const override final; void sellItem(const int beingId, const int itemId, - const int amount) const override; + const int amount) const override final; int getNpc(Net::MessageIn &msg, - const bool haveLength) override A_WARN_UNUSED; + const bool haveLength) override final A_WARN_UNUSED; void processNpcCommand(Net::MessageIn &msg, const int npcId); diff --git a/src/net/tmwa/partyhandler.h b/src/net/tmwa/partyhandler.h index d403b557a..586f866cc 100644 --- a/src/net/tmwa/partyhandler.h +++ b/src/net/tmwa/partyhandler.h @@ -40,28 +40,28 @@ class PartyHandler final : public MessageHandler, public Ea::PartyHandler ~PartyHandler(); - void handleMessage(Net::MessageIn &msg) override; + void handleMessage(Net::MessageIn &msg) override final; - void create(const std::string &name) const override; + void create(const std::string &name) const override final; - void invite(Being *const being) const override; + void invite(Being *const being) const override final; - void invite(const std::string &name) const override; + void invite(const std::string &name) const override final; void inviteResponse(const std::string &inviter, - const bool accept) const override; + const bool accept) const override final; - void leave() const override; + void leave() const override final; - void kick(Being *const being) const override; + void kick(Being *const being) const override final; - void kick(const std::string &name) const override; + void kick(const std::string &name) const override final; - void chat(const std::string &text) const override; + void chat(const std::string &text) const override final; - void setShareExperience(const PartyShare share) const override; + void setShareExperience(const PartyShare share) const override final; - void setShareItems(const PartyShare share) const override; + void setShareItems(const PartyShare share) const override final; }; } // namespace TmwAthena diff --git a/src/net/tmwa/playerhandler.h b/src/net/tmwa/playerhandler.h index aa6cf1d94..102151b05 100644 --- a/src/net/tmwa/playerhandler.h +++ b/src/net/tmwa/playerhandler.h @@ -37,25 +37,25 @@ class PlayerHandler final : public MessageHandler, public Ea::PlayerHandler A_DELETE_COPY(PlayerHandler) - void handleMessage(Net::MessageIn &msg) override; + void handleMessage(Net::MessageIn &msg) override final; - void attack(const int id, const bool keep) const override; - void stopAttack() const override; - void emote(const uint8_t emoteId) const override; + void attack(const int id, const bool keep) const override final; + void stopAttack() const override final; + void emote(const uint8_t emoteId) const override final; - void increaseAttribute(const int attr) const override; - void increaseSkill(const uint16_t skillId) const override; + void increaseAttribute(const int attr) const override final; + void increaseSkill(const uint16_t skillId) const override final; - void pickUp(const FloorItem *const floorItem) const override; - void setDirection(const unsigned char direction) const override; + void pickUp(const FloorItem *const floorItem) const override final; + void setDirection(const unsigned char direction) const override final; void setDestination(const int x, const int y, - const int direction) const override; - void changeAction(const Being::Action &action) const override; + const int direction) const override final; + void changeAction(const Being::Action &action) const override final; void processOnlineList(Net::MessageIn &msg) const; - void requestOnlineList() const override; - void updateStatus(const uint8_t status) const override; + void requestOnlineList() const override final; + void updateStatus(const uint8_t status) const override final; - void respawn() const override; + void respawn() const override final; }; } // namespace TmwAthena diff --git a/src/net/tmwa/questhandler.h b/src/net/tmwa/questhandler.h index 80d39e67b..a92b601c3 100644 --- a/src/net/tmwa/questhandler.h +++ b/src/net/tmwa/questhandler.h @@ -33,7 +33,7 @@ class QuestHandler final : public MessageHandler A_DELETE_COPY(QuestHandler) - void handleMessage(Net::MessageIn &msg) override; + void handleMessage(Net::MessageIn &msg) override final; void processSetQuestVar(Net::MessageIn &msg) const; diff --git a/src/net/tmwa/skillhandler.h b/src/net/tmwa/skillhandler.h index 129331ff3..1b951df96 100644 --- a/src/net/tmwa/skillhandler.h +++ b/src/net/tmwa/skillhandler.h @@ -37,15 +37,15 @@ class SkillHandler final : public MessageHandler, public Ea::SkillHandler A_DELETE_COPY(SkillHandler) - void handleMessage(Net::MessageIn &msg) override; + void handleMessage(Net::MessageIn &msg) override final; void useBeing(const int id, const int level, - const int beingId) const override; + const int beingId) const override final; void usePos(const int id, const int level, - const int x, const int y) const override; + const int x, const int y) const override final; - void useMap(const int id, const std::string &map) const override; + void useMap(const int id, const std::string &map) const override final; }; } // namespace TmwAthena diff --git a/src/net/tmwa/tradehandler.h b/src/net/tmwa/tradehandler.h index 9e6137f87..c3367ee73 100644 --- a/src/net/tmwa/tradehandler.h +++ b/src/net/tmwa/tradehandler.h @@ -37,21 +37,22 @@ class TradeHandler final : public MessageHandler, public Ea::TradeHandler A_DELETE_COPY(TradeHandler) - void handleMessage(Net::MessageIn &msg) override; + void handleMessage(Net::MessageIn &msg) override final; - void request(const Being *const being) const override; + void request(const Being *const being) const override final; - void respond(const bool accept) const override; + void respond(const bool accept) const override final; - void addItem(const Item *const item, const int amount) const override; + void addItem(const Item *const item, + const int amount) const override final; - void setMoney(const int amount) const override; + void setMoney(const int amount) const override final; - void confirm() const override; + void confirm() const override final; - void finish() const override; + void finish() const override final; - void cancel() const override; + void cancel() const override final; }; } // namespace TmwAthena -- cgit v1.2.3-70-g09d2