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/net/ea/adminhandler.h | 18 +++++++++--------- src/net/ea/charserverhandler.h | 12 ++++++------ src/net/ea/chathandler.h | 4 ++-- src/net/ea/equipbackend.h | 4 ++-- src/net/ea/gamehandler.h | 8 ++++---- src/net/ea/guildhandler.h | 4 ++-- src/net/ea/inventoryhandler.h | 16 ++++++++-------- src/net/ea/loginhandler.h | 20 ++++++++++---------- src/net/ea/npchandler.h | 2 +- src/net/ea/partyhandler.h | 10 +++++----- src/net/ea/playerhandler.h | 8 ++++---- src/net/ea/tradehandler.h | 2 +- 12 files changed, 54 insertions(+), 54 deletions(-) (limited to 'src/net/ea') diff --git a/src/net/ea/adminhandler.h b/src/net/ea/adminhandler.h index b8215a1cc..9dcbbc9bd 100644 --- a/src/net/ea/adminhandler.h +++ b/src/net/ea/adminhandler.h @@ -41,25 +41,25 @@ class AdminHandler notfinal : public Net::AdminHandler virtual ~AdminHandler() { } - void kickName(const std::string &name) const final; + void kickName(const std::string &name) const override final; - void ban(const int playerId) const final A_CONST; + void ban(const int playerId) const override final A_CONST; - void banName(const std::string &name) const final; + void banName(const std::string &name) const override final; - void unban(const int playerId) const final A_CONST; + void unban(const int playerId) const override final A_CONST; - void unbanName(const std::string &name) const final; + void unbanName(const std::string &name) const override final; - void ipcheckName(const std::string &name) const final; + void ipcheckName(const std::string &name) const override final; - void slide(const int x, const int y) const final; + void slide(const int x, const int y) const override final; void createItems(const int id, const ItemColor color, - const int amount) const final; + const int amount) const override final; - void spawn(const std::string &name) const final; + void spawn(const std::string &name) const override final; }; } // namespace Ea diff --git a/src/net/ea/charserverhandler.h b/src/net/ea/charserverhandler.h index 936976ea9..09899cd0c 100644 --- a/src/net/ea/charserverhandler.h +++ b/src/net/ea/charserverhandler.h @@ -37,19 +37,19 @@ class CharServerHandler notfinal : public Net::CharServerHandler A_DELETE_COPY(CharServerHandler) void setCharSelectDialog(CharSelectDialog *const window) const - final; + override final; - void requestCharacters() const final; + void requestCharacters() const override final; - unsigned int baseSprite() const final A_CONST A_WARN_UNUSED; + unsigned int baseSprite() const override final A_CONST A_WARN_UNUSED; - unsigned int hairSprite() const final A_CONST A_WARN_UNUSED; + unsigned int hairSprite() const override final A_CONST A_WARN_UNUSED; - unsigned int maxSprite() const final A_CONST A_WARN_UNUSED; + unsigned int maxSprite() const override final A_CONST A_WARN_UNUSED; virtual void connect() const = 0; - void clear() const final; + void clear() const override final; protected: CharServerHandler(); diff --git a/src/net/ea/chathandler.h b/src/net/ea/chathandler.h index 98c58297c..9a67b79b1 100644 --- a/src/net/ea/chathandler.h +++ b/src/net/ea/chathandler.h @@ -40,9 +40,9 @@ class ChatHandler notfinal : public Net::ChatHandler A_DELETE_COPY(ChatHandler) void me(const std::string &restrict text, - const std::string &restrict channel) const final; + const std::string &restrict channel) const override final; - void clear() const final; + void clear() const override final; }; } // namespace Ea diff --git a/src/net/ea/equipbackend.h b/src/net/ea/equipbackend.h index f51598fb1..aa278dad0 100644 --- a/src/net/ea/equipbackend.h +++ b/src/net/ea/equipbackend.h @@ -44,7 +44,7 @@ class EquipBackend final : public Equipment::Backend A_DELETE_COPY(EquipBackend) - Item *getEquipment(const int index) const final A_WARN_UNUSED + Item *getEquipment(const int index) const override final A_WARN_UNUSED { int invyIndex = mEquipment[index]; if (invyIndex == -1) @@ -57,7 +57,7 @@ class EquipBackend final : public Equipment::Backend return nullptr; } - void clear() final + void clear() override final { Inventory *const inv = PlayerInfo::getInventory(); if (!inv) diff --git a/src/net/ea/gamehandler.h b/src/net/ea/gamehandler.h index da5174e83..c18333ab5 100644 --- a/src/net/ea/gamehandler.h +++ b/src/net/ea/gamehandler.h @@ -35,16 +35,16 @@ class GameHandler notfinal : public Net::GameHandler A_DELETE_COPY(GameHandler) - void who() const final A_CONST; + void who() const override final A_CONST; - bool removeDeadBeings() const final A_WARN_UNUSED + bool removeDeadBeings() const override final A_WARN_UNUSED { return true; } static void setMap(const std::string &map); - void clear() const final; + void clear() const override final; - void initEngines() const final; + void initEngines() const override final; }; } // namespace Ea diff --git a/src/net/ea/guildhandler.h b/src/net/ea/guildhandler.h index 5e7a6fc81..30abd42ce 100644 --- a/src/net/ea/guildhandler.h +++ b/src/net/ea/guildhandler.h @@ -37,9 +37,9 @@ class GuildHandler notfinal : public Net::GuildHandler virtual ~GuildHandler(); - void clear() const final; + void clear() const override final; - ChatTab *getTab() const final; + ChatTab *getTab() const override final; }; extern Guild *taGuild; diff --git a/src/net/ea/inventoryhandler.h b/src/net/ea/inventoryhandler.h index 959e91bb5..98a617c83 100644 --- a/src/net/ea/inventoryhandler.h +++ b/src/net/ea/inventoryhandler.h @@ -41,27 +41,27 @@ class InventoryHandler notfinal : public Net::InventoryHandler virtual ~InventoryHandler(); - void clear() const final; + void clear() const override final; bool canSplit(const Item *const item) const - final A_CONST A_WARN_UNUSED; + override final A_CONST A_WARN_UNUSED; void splitItem(const Item *const item, - const int amount) const final A_CONST; + const int amount) const override final A_CONST; void moveItem(const int oldIndex, - const int newIndex) const final A_CONST; + const int newIndex) const override final A_CONST; - size_t getSize(const InventoryTypeT type) const final + size_t getSize(const InventoryTypeT type) const override final A_CONST A_WARN_UNUSED; static void pushPickup(const BeingId floorId); - void destroyStorage() const final; + void destroyStorage() const override final; - void forgotStorage() const final; + void forgotStorage() const override final; - Inventory *getStorage() const final; + Inventory *getStorage() const override final; protected: InventoryHandler(); diff --git a/src/net/ea/loginhandler.h b/src/net/ea/loginhandler.h index e110154b4..7cd4c9c1b 100644 --- a/src/net/ea/loginhandler.h +++ b/src/net/ea/loginhandler.h @@ -39,39 +39,39 @@ class LoginHandler notfinal : public Net::LoginHandler virtual ~LoginHandler(); - bool isRegistrationEnabled() const final A_WARN_UNUSED; + bool isRegistrationEnabled() const override final A_WARN_UNUSED; - void getRegistrationDetails() const final; + void getRegistrationDetails() const override final; unsigned int getMaxPasswordLength() const override A_WARN_UNUSED { return 24; } - void loginAccount(LoginData *const loginData) const final; + void loginAccount(LoginData *const loginData) const override final; void chooseServer(const unsigned int server, const bool persistentIp) const override; void registerAccount(const LoginData *const loginData) - const final; + const override final; - const Worlds &getWorlds() const final A_CONST A_WARN_UNUSED; + const Worlds &getWorlds() const override final A_CONST A_WARN_UNUSED; - void clearWorlds() const final; + void clearWorlds() const override final; virtual ServerInfo *getCharServer() const A_WARN_UNUSED = 0; const Token &getToken() const A_CONST A_WARN_UNUSED; - void logout() const final A_CONST; + void logout() const override final A_CONST; void changeEmail(const std::string &email) const - final A_CONST; + override final A_CONST; void unregisterAccount(const std::string &username, const std::string &password) - const final A_CONST; + const override final A_CONST; - void loginOrRegister(LoginData *const data) const final; + void loginOrRegister(LoginData *const data) const override final; protected: LoginHandler(); diff --git a/src/net/ea/npchandler.h b/src/net/ea/npchandler.h index bd1e63cb4..916f77556 100644 --- a/src/net/ea/npchandler.h +++ b/src/net/ea/npchandler.h @@ -35,7 +35,7 @@ class NpcHandler notfinal : public Net::NpcHandler public: A_DELETE_COPY(NpcHandler) - NpcDialog *getCurrentNpcDialog() const final; + NpcDialog *getCurrentNpcDialog() const override final; protected: NpcHandler(); diff --git a/src/net/ea/partyhandler.h b/src/net/ea/partyhandler.h index 5f634e65d..49c7fb1cc 100644 --- a/src/net/ea/partyhandler.h +++ b/src/net/ea/partyhandler.h @@ -37,17 +37,17 @@ class PartyHandler notfinal : public Net::PartyHandler virtual ~PartyHandler(); - void join(const int partyId) const final A_CONST; + void join(const int partyId) const override final A_CONST; - PartyShareT getShareExperience() const final A_WARN_UNUSED; + PartyShareT getShareExperience() const override final A_WARN_UNUSED; - PartyShareT getShareItems() const final A_WARN_UNUSED; + PartyShareT getShareItems() const override final A_WARN_UNUSED; static void reload(); - void clear() const final; + void clear() const override final; - ChatTab *getTab() const final; + ChatTab *getTab() const override final; }; extern Party *taParty; diff --git a/src/net/ea/playerhandler.h b/src/net/ea/playerhandler.h index ebafb4bda..6b3b85073 100644 --- a/src/net/ea/playerhandler.h +++ b/src/net/ea/playerhandler.h @@ -38,13 +38,13 @@ class PlayerHandler notfinal : public Net::PlayerHandler A_DELETE_COPY(PlayerHandler) void ignorePlayer(const std::string &player, - const bool ignore) const final A_CONST; + const bool ignore) const override final A_CONST; - void ignoreAll(const bool ignore) const final A_CONST; + void ignoreAll(const bool ignore) const override final A_CONST; - bool canUseMagic() const final; + bool canUseMagic() const override final; - int getDefaultWalkSpeed() const final A_WARN_UNUSED; + int getDefaultWalkSpeed() const override final A_WARN_UNUSED; }; } // namespace Ea diff --git a/src/net/ea/tradehandler.h b/src/net/ea/tradehandler.h index c9e295df9..dbdffb8e6 100644 --- a/src/net/ea/tradehandler.h +++ b/src/net/ea/tradehandler.h @@ -36,7 +36,7 @@ class TradeHandler notfinal : public Net::TradeHandler A_DELETE_COPY(TradeHandler) void removeItem(const int slotNum, - const int amount) const final A_CONST; + const int amount) const override final A_CONST; }; } // namespace Ea -- cgit v1.2.3-70-g09d2