From 0c863b2e2cc7f5be6baa918c8fffb0ee44c02cc7 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 18 Feb 2015 13:20:34 +0300 Subject: Add missing override keywords. --- src/net/ea/equipbackend.h | 2 +- src/net/ea/inventoryhandler.h | 4 ++-- src/net/eathena/adminhandler.h | 2 +- src/net/eathena/buysellhandler.h | 2 +- src/net/eathena/charserverhandler.h | 2 +- src/net/eathena/guildhandler.h | 2 +- src/net/eathena/messagein.h | 6 +++--- src/net/eathena/messageout.h | 6 +++--- src/net/tmwa/adminhandler.h | 2 +- src/net/tmwa/buyingstorehandler.h | 2 +- src/net/tmwa/buysellhandler.h | 2 +- src/net/tmwa/charserverhandler.h | 2 +- src/net/tmwa/chathandler.h | 2 +- src/net/tmwa/guildhandler.h | 2 +- src/net/tmwa/messagein.h | 6 +++--- src/net/tmwa/messageout.h | 6 +++--- src/net/tmwa/npchandler.h | 2 +- 17 files changed, 26 insertions(+), 26 deletions(-) (limited to 'src/net') diff --git a/src/net/ea/equipbackend.h b/src/net/ea/equipbackend.h index 3b3297315..5aa56bf6b 100644 --- a/src/net/ea/equipbackend.h +++ b/src/net/ea/equipbackend.h @@ -56,7 +56,7 @@ class EquipBackend final : public Equipment::Backend return nullptr; } - void clear() + void clear() override final { Inventory *const inv = PlayerInfo::getInventory(); if (!inv) diff --git a/src/net/ea/inventoryhandler.h b/src/net/ea/inventoryhandler.h index c8aadc514..9b2e85287 100644 --- a/src/net/ea/inventoryhandler.h +++ b/src/net/ea/inventoryhandler.h @@ -51,7 +51,7 @@ class InventoryHandler notfinal : public Net::InventoryHandler virtual ~InventoryHandler(); - void clear(); + void clear() override final; bool canSplit(const Item *const item) const override final A_WARN_UNUSED; @@ -89,7 +89,7 @@ class InventoryHandler notfinal : public Net::InventoryHandler void forgotStorage() override final; - Inventory *getStorage() const + Inventory *getStorage() const override final { return mStorage; } protected: diff --git a/src/net/eathena/adminhandler.h b/src/net/eathena/adminhandler.h index 363e6aceb..7faf9b383 100644 --- a/src/net/eathena/adminhandler.h +++ b/src/net/eathena/adminhandler.h @@ -69,7 +69,7 @@ class AdminHandler final : public MessageHandler, public Ea::AdminHandler void requestLogin(const Being *const being) const override final; void setTileType(const int x, const int y, - const int type) const; + const int type) const override final; void unequipAll(const Being *const being) const override final; diff --git a/src/net/eathena/buysellhandler.h b/src/net/eathena/buysellhandler.h index 4b151c2b1..9f2df6089 100644 --- a/src/net/eathena/buysellhandler.h +++ b/src/net/eathena/buysellhandler.h @@ -37,7 +37,7 @@ class BuySellHandler final : public MessageHandler, public Ea::BuySellHandler A_DELETE_COPY(BuySellHandler) - void handleMessage(Net::MessageIn &msg); + void handleMessage(Net::MessageIn &msg) override final; static void processNpcBuy(Net::MessageIn &msg); diff --git a/src/net/eathena/charserverhandler.h b/src/net/eathena/charserverhandler.h index 0b424024a..b93b7f44a 100644 --- a/src/net/eathena/charserverhandler.h +++ b/src/net/eathena/charserverhandler.h @@ -70,7 +70,7 @@ class CharServerHandler final : public MessageHandler, void processChangeMapServer(Net::MessageIn &msg); - bool isNeedCreatePin() const A_WARN_UNUSED + bool isNeedCreatePin() const override final A_WARN_UNUSED { return mNeedCreatePin; } void setNewPincode(const std::string &pin) override final; diff --git a/src/net/eathena/guildhandler.h b/src/net/eathena/guildhandler.h index 5925352f3..b2c37c9d7 100644 --- a/src/net/eathena/guildhandler.h +++ b/src/net/eathena/guildhandler.h @@ -71,7 +71,7 @@ class GuildHandler final : public Ea::GuildHandler, public MessageHandler const std::string &restrict msg2) const override final; - void checkMaster() const; + void checkMaster() const override final; protected: static void processGuildUpdateCoords(Net::MessageIn &msg); diff --git a/src/net/eathena/messagein.h b/src/net/eathena/messagein.h index b1aacb59d..1a674e129 100644 --- a/src/net/eathena/messagein.h +++ b/src/net/eathena/messagein.h @@ -48,11 +48,11 @@ class MessageIn final : public Net::MessageIn void postInit(); /**< Reads a short. */ - int16_t readInt16(const char *const str); + int16_t readInt16(const char *const str) override final; /**< Reads a long. */ - int32_t readInt32(const char *const str); + int32_t readInt32(const char *const str) override final; - int64_t readInt64(const char *const str); + int64_t readInt64(const char *const str) override final; uint16_t readId(); }; diff --git a/src/net/eathena/messageout.h b/src/net/eathena/messageout.h index fbdbc21e0..11b124e26 100644 --- a/src/net/eathena/messageout.h +++ b/src/net/eathena/messageout.h @@ -50,11 +50,11 @@ class MessageOut final : public Net::MessageOut /**< Writes a short. */ void writeInt16(const int16_t value, - const char *const str); + const char *const str) override final; /**< Writes a long. */ void writeInt32(const int32_t value, - const char *const str); + const char *const str) override final; /** * Encodes coordinates and direction in 3 bytes. @@ -68,7 +68,7 @@ class MessageOut final : public Net::MessageOut { mPos = 0; } private: - void expand(const size_t size); + void expand(const size_t size) override final; Network *mNetwork; }; diff --git a/src/net/tmwa/adminhandler.h b/src/net/tmwa/adminhandler.h index 1f0461fbf..35a4ccead 100644 --- a/src/net/tmwa/adminhandler.h +++ b/src/net/tmwa/adminhandler.h @@ -69,7 +69,7 @@ class AdminHandler final : public MessageHandler, public Ea::AdminHandler void requestLogin(const Being *const being) const override final; void setTileType(const int x, const int y, - const int type) const; + const int type) const override final; void unequipAll(const Being *const being) const override final; diff --git a/src/net/tmwa/buyingstorehandler.h b/src/net/tmwa/buyingstorehandler.h index b98325acc..381fe5c1a 100644 --- a/src/net/tmwa/buyingstorehandler.h +++ b/src/net/tmwa/buyingstorehandler.h @@ -41,7 +41,7 @@ class BuyingStoreHandler final : public MessageHandler, void create(const std::string &name, const int maxMoney, const bool flag, - std::vector &items) const; + std::vector &items) const override final; void close() const override final; diff --git a/src/net/tmwa/buysellhandler.h b/src/net/tmwa/buysellhandler.h index 33b234f43..b823ee2db 100644 --- a/src/net/tmwa/buysellhandler.h +++ b/src/net/tmwa/buysellhandler.h @@ -37,7 +37,7 @@ class BuySellHandler final : public MessageHandler, public Ea::BuySellHandler A_DELETE_COPY(BuySellHandler) - void handleMessage(Net::MessageIn &msg); + void handleMessage(Net::MessageIn &msg) override final; static void processNpcBuy(Net::MessageIn &msg); diff --git a/src/net/tmwa/charserverhandler.h b/src/net/tmwa/charserverhandler.h index 509d82c0c..28d73110d 100644 --- a/src/net/tmwa/charserverhandler.h +++ b/src/net/tmwa/charserverhandler.h @@ -70,7 +70,7 @@ class CharServerHandler final : public MessageHandler, void processChangeMapServer(Net::MessageIn &msg); - bool isNeedCreatePin() const + bool isNeedCreatePin() const override final { return false; } void setNewPincode(const std::string &pin A_UNUSED) override final diff --git a/src/net/tmwa/chathandler.h b/src/net/tmwa/chathandler.h index 811dbda9f..4639a7cae 100644 --- a/src/net/tmwa/chathandler.h +++ b/src/net/tmwa/chathandler.h @@ -55,7 +55,7 @@ class ChatHandler final : public MessageHandler, public Ea::ChatHandler void who() const override final; - void sendRaw(const std::string &args) const; + void sendRaw(const std::string &args) const override final; void ignoreAll() const override final; diff --git a/src/net/tmwa/guildhandler.h b/src/net/tmwa/guildhandler.h index c9a70e943..b233fc898 100644 --- a/src/net/tmwa/guildhandler.h +++ b/src/net/tmwa/guildhandler.h @@ -71,7 +71,7 @@ class GuildHandler final : public Ea::GuildHandler, public MessageHandler const std::string &restrict msg2) const override final; - void checkMaster() const; + void checkMaster() const override final; protected: static void processGuildPositionInfo(Net::MessageIn &msg); diff --git a/src/net/tmwa/messagein.h b/src/net/tmwa/messagein.h index e34e546a3..ef542bab2 100644 --- a/src/net/tmwa/messagein.h +++ b/src/net/tmwa/messagein.h @@ -48,11 +48,11 @@ class MessageIn final : public Net::MessageIn void postInit(); /**< Reads a short. */ - int16_t readInt16(const char *const str); + int16_t readInt16(const char *const str) override final; /**< Reads a long. */ - int32_t readInt32(const char *const str); + int32_t readInt32(const char *const str) override final; - int64_t readInt64(const char *const str); + int64_t readInt64(const char *const str) override final; uint16_t readId(); }; diff --git a/src/net/tmwa/messageout.h b/src/net/tmwa/messageout.h index 69e32fa40..c6aa522cc 100644 --- a/src/net/tmwa/messageout.h +++ b/src/net/tmwa/messageout.h @@ -50,11 +50,11 @@ class MessageOut final : public Net::MessageOut /**< Writes a short. */ void writeInt16(const int16_t value, - const char *const str); + const char *const str) override final; /**< Writes a long. */ void writeInt32(const int32_t value, - const char *const str); + const char *const str) override final; /** * Encodes coordinates and direction in 3 bytes. @@ -68,7 +68,7 @@ class MessageOut final : public Net::MessageOut { mPos = 0; } private: - void expand(const size_t size); + void expand(const size_t size) override final; Network *mNetwork; }; diff --git a/src/net/tmwa/npchandler.h b/src/net/tmwa/npchandler.h index f32ca7f6b..d82885da0 100644 --- a/src/net/tmwa/npchandler.h +++ b/src/net/tmwa/npchandler.h @@ -75,7 +75,7 @@ class NpcHandler final : public MessageHandler, public Ea::NpcHandler const int materialId3) const override final; void cooking(const CookingType::Type type, - const int nameId) const; + const int nameId) const override final; void repair(const int index) const override final; -- cgit v1.2.3-60-g2f50