From b50eee3c4571c4a4657bc14c2935067d833bb801 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 23 Dec 2015 01:48:19 +0300 Subject: Add const attribute to net classes. --- src/net/ea/adminhandler.h | 4 ++-- src/net/ea/charserverhandler.h | 6 +++--- src/net/ea/gamehandler.h | 2 +- src/net/ea/inventoryhandler.cpp | 5 ----- src/net/ea/inventoryhandler.h | 10 ++++------ src/net/ea/loginhandler.h | 11 ++++++----- src/net/ea/partyhandler.h | 2 +- src/net/ea/playerhandler.h | 7 ++++--- src/net/ea/tradehandler.h | 2 +- 9 files changed, 22 insertions(+), 27 deletions(-) (limited to 'src/net/ea') diff --git a/src/net/ea/adminhandler.h b/src/net/ea/adminhandler.h index c73fbafde..52d648bb4 100644 --- a/src/net/ea/adminhandler.h +++ b/src/net/ea/adminhandler.h @@ -43,11 +43,11 @@ class AdminHandler notfinal : public Net::AdminHandler void kickName(const std::string &name) const override final; - void ban(const int playerId) const override final; + void ban(const int playerId) const override final A_CONST; void banName(const std::string &name) const override final; - void unban(const int playerId) const override final; + void unban(const int playerId) const override final A_CONST; void unbanName(const std::string &name) const override final; diff --git a/src/net/ea/charserverhandler.h b/src/net/ea/charserverhandler.h index 72a7baff8..e6b739844 100644 --- a/src/net/ea/charserverhandler.h +++ b/src/net/ea/charserverhandler.h @@ -41,11 +41,11 @@ class CharServerHandler notfinal : public Net::CharServerHandler void requestCharacters() override final; - unsigned int baseSprite() const override final A_WARN_UNUSED; + unsigned int baseSprite() const override final A_CONST A_WARN_UNUSED; - unsigned int hairSprite() const override final A_WARN_UNUSED; + unsigned int hairSprite() const override final A_CONST A_WARN_UNUSED; - unsigned int maxSprite() const override final A_WARN_UNUSED; + unsigned int maxSprite() const override final A_CONST A_WARN_UNUSED; virtual void connect() = 0; diff --git a/src/net/ea/gamehandler.h b/src/net/ea/gamehandler.h index 123fbb543..1f35e9518 100644 --- a/src/net/ea/gamehandler.h +++ b/src/net/ea/gamehandler.h @@ -35,7 +35,7 @@ class GameHandler notfinal : public Net::GameHandler A_DELETE_COPY(GameHandler) - void who() const override final; + void who() const override final A_CONST; bool removeDeadBeings() const override final A_WARN_UNUSED { return true; } diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp index 44931ae8a..8f1fbe332 100644 --- a/src/net/ea/inventoryhandler.cpp +++ b/src/net/ea/inventoryhandler.cpp @@ -76,11 +76,6 @@ void InventoryHandler::moveItem(const int oldIndex A_UNUSED, // Not implemented for eAthena (possible?) } -void InventoryHandler::openStorage(const int type A_UNUSED) const -{ - // Doesn't apply to eAthena, since opening happens through NPCs? -} - size_t InventoryHandler::getSize(const InventoryTypeT type) const { switch (type) diff --git a/src/net/ea/inventoryhandler.h b/src/net/ea/inventoryhandler.h index 5c6f4258e..b6f6fdc06 100644 --- a/src/net/ea/inventoryhandler.h +++ b/src/net/ea/inventoryhandler.h @@ -46,18 +46,16 @@ class InventoryHandler notfinal : public Net::InventoryHandler void clear() override final; bool canSplit(const Item *const item) const - override final A_WARN_UNUSED; + override final A_CONST A_WARN_UNUSED; void splitItem(const Item *const item, - const int amount) const override final; + const int amount) const override final A_CONST; void moveItem(const int oldIndex, - const int newIndex) const override final; - - void openStorage(const int type) const override final; + const int newIndex) const override final A_CONST; size_t getSize(const InventoryTypeT type) const override final - A_WARN_UNUSED; + A_CONST A_WARN_UNUSED; void pushPickup(const BeingId floorId); diff --git a/src/net/ea/loginhandler.h b/src/net/ea/loginhandler.h index fb9003473..63bf0afc8 100644 --- a/src/net/ea/loginhandler.h +++ b/src/net/ea/loginhandler.h @@ -54,21 +54,22 @@ class LoginHandler notfinal : public Net::LoginHandler void registerAccount(const LoginData *const loginData) const override final; - const Worlds &getWorlds() const override final A_WARN_UNUSED; + const Worlds &getWorlds() const override final A_CONST A_WARN_UNUSED; void clearWorlds() override final; virtual ServerInfo *getCharServer() const A_WARN_UNUSED = 0; - const Token &getToken() const A_WARN_UNUSED; + const Token &getToken() const A_CONST A_WARN_UNUSED; - void logout() const override final; + void logout() const override final A_CONST; - void changeEmail(const std::string &email) const override final; + void changeEmail(const std::string &email) const + override final A_CONST; void unregisterAccount(const std::string &username, const std::string &password) - const override final; + const override final A_CONST; void loginOrRegister(LoginData *const data) const override final; diff --git a/src/net/ea/partyhandler.h b/src/net/ea/partyhandler.h index 2dc8e5c87..22c9592f3 100644 --- a/src/net/ea/partyhandler.h +++ b/src/net/ea/partyhandler.h @@ -37,7 +37,7 @@ class PartyHandler notfinal : public Net::PartyHandler virtual ~PartyHandler(); - void join(const int partyId) const override final; + void join(const int partyId) const override final A_CONST; PartyShareT getShareExperience() const override final A_WARN_UNUSED; diff --git a/src/net/ea/playerhandler.h b/src/net/ea/playerhandler.h index a04d78ee6..c94e1f4fb 100644 --- a/src/net/ea/playerhandler.h +++ b/src/net/ea/playerhandler.h @@ -42,12 +42,13 @@ class PlayerHandler notfinal : public Net::PlayerHandler A_DELETE_COPY(PlayerHandler) - void decreaseAttribute(const AttributesT attr) const override final; + void decreaseAttribute(const AttributesT attr) const + override final A_CONST; void ignorePlayer(const std::string &player, - const bool ignore) const override final; + const bool ignore) const override final A_CONST; - void ignoreAll(const bool ignore) const override final; + void ignoreAll(const bool ignore) const override final A_CONST; bool canUseMagic() const override final; diff --git a/src/net/ea/tradehandler.h b/src/net/ea/tradehandler.h index 1ee4bde92..3e19ce91e 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 override final; + const int amount) const override final A_CONST; }; } // namespace Ea -- cgit v1.2.3-70-g09d2