diff options
author | Andrei Karas <akaras@inbox.ru> | 2017-12-28 19:29:05 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2017-12-28 19:29:05 +0300 |
commit | 00f62e4f3db5aa737b4242a3d691d2ade299fc72 (patch) | |
tree | ee6fd7021bc7e4a69a1f9e69a4f3c3041f183f4d /src/net | |
parent | 1fc73fd6d8cb70e306b3bdeb375de1dd1e9458cc (diff) | |
download | plus-00f62e4f3db5aa737b4242a3d691d2ade299fc72.tar.gz plus-00f62e4f3db5aa737b4242a3d691d2ade299fc72.tar.bz2 plus-00f62e4f3db5aa737b4242a3d691d2ade299fc72.tar.xz plus-00f62e4f3db5aa737b4242a3d691d2ade299fc72.zip |
Add missing override and final to destructors.
Also remove some empty destructors.
Diffstat (limited to 'src/net')
78 files changed, 78 insertions, 78 deletions
diff --git a/src/net/ea/adminhandler.h b/src/net/ea/adminhandler.h index f300fda55..a4e2d7b68 100644 --- a/src/net/ea/adminhandler.h +++ b/src/net/ea/adminhandler.h @@ -38,7 +38,7 @@ class AdminHandler notfinal : public Net::AdminHandler A_DELETE_COPY(AdminHandler) - virtual ~AdminHandler() + ~AdminHandler() override { } void kickName(const std::string &name) const override final; diff --git a/src/net/ea/charserverhandler.h b/src/net/ea/charserverhandler.h index 1faa59403..e3a377645 100644 --- a/src/net/ea/charserverhandler.h +++ b/src/net/ea/charserverhandler.h @@ -36,7 +36,7 @@ class CharServerHandler notfinal : public Net::CharServerHandler public: A_DELETE_COPY(CharServerHandler) - ~CharServerHandler(); + ~CharServerHandler() override; void setCharSelectDialog(CharSelectDialog *const window) const override final; diff --git a/src/net/ea/chathandler.h b/src/net/ea/chathandler.h index b19105193..1053be26f 100644 --- a/src/net/ea/chathandler.h +++ b/src/net/ea/chathandler.h @@ -39,7 +39,7 @@ class ChatHandler notfinal : public Net::ChatHandler A_DELETE_COPY(ChatHandler) - ~ChatHandler(); + ~ChatHandler() override; void me(const std::string &restrict text, const std::string &restrict channel) const override final; diff --git a/src/net/ea/inventoryhandler.h b/src/net/ea/inventoryhandler.h index f968a3216..0df7fc793 100644 --- a/src/net/ea/inventoryhandler.h +++ b/src/net/ea/inventoryhandler.h @@ -39,7 +39,7 @@ class InventoryHandler notfinal : public Net::InventoryHandler public: A_DELETE_COPY(InventoryHandler) - virtual ~InventoryHandler(); + ~InventoryHandler() override; void clear() const override final; diff --git a/src/net/ea/loginhandler.h b/src/net/ea/loginhandler.h index d475fc184..320f914ac 100644 --- a/src/net/ea/loginhandler.h +++ b/src/net/ea/loginhandler.h @@ -37,7 +37,7 @@ class LoginHandler notfinal : public Net::LoginHandler public: A_DELETE_COPY(LoginHandler) - virtual ~LoginHandler(); + ~LoginHandler() override; bool isRegistrationEnabled() const override final A_WARN_UNUSED; diff --git a/src/net/ea/partyhandler.h b/src/net/ea/partyhandler.h index 2be323d85..2b74cd4d6 100644 --- a/src/net/ea/partyhandler.h +++ b/src/net/ea/partyhandler.h @@ -35,7 +35,7 @@ class PartyHandler notfinal : public Net::PartyHandler A_DELETE_COPY(PartyHandler) - virtual ~PartyHandler(); + ~PartyHandler() override; void join(const int partyId) const override final A_CONST; diff --git a/src/net/eathena/adminhandler.h b/src/net/eathena/adminhandler.h index 2cee9a354..63eff6eb5 100644 --- a/src/net/eathena/adminhandler.h +++ b/src/net/eathena/adminhandler.h @@ -35,7 +35,7 @@ class AdminHandler final : public Ea::AdminHandler A_DELETE_COPY(AdminHandler) - ~AdminHandler(); + ~AdminHandler() override final; void announce(const std::string &text) const override final; diff --git a/src/net/eathena/auctionhandler.h b/src/net/eathena/auctionhandler.h index 097f4ca3b..fc4cff419 100644 --- a/src/net/eathena/auctionhandler.h +++ b/src/net/eathena/auctionhandler.h @@ -32,7 +32,7 @@ class AuctionHandler final : public Net::AuctionHandler A_DELETE_COPY(AuctionHandler) - ~AuctionHandler(); + ~AuctionHandler() override final; void cancelReg() const override final; diff --git a/src/net/eathena/bankhandler.h b/src/net/eathena/bankhandler.h index 0e890a61e..7bf50487a 100644 --- a/src/net/eathena/bankhandler.h +++ b/src/net/eathena/bankhandler.h @@ -32,7 +32,7 @@ class BankHandler final : public Net::BankHandler A_DELETE_COPY(BankHandler) - ~BankHandler(); + ~BankHandler() override final; void deposit(const int money) const override final; diff --git a/src/net/eathena/battlegroundhandler.h b/src/net/eathena/battlegroundhandler.h index 230146963..cc3bb2c5c 100644 --- a/src/net/eathena/battlegroundhandler.h +++ b/src/net/eathena/battlegroundhandler.h @@ -32,7 +32,7 @@ class BattleGroundHandler final : public Net::BattleGroundHandler A_DELETE_COPY(BattleGroundHandler) - ~BattleGroundHandler(); + ~BattleGroundHandler() override final; void registerBg(const BattleGroundTypeT &type, const std::string &name) const override final; diff --git a/src/net/eathena/beinghandler.h b/src/net/eathena/beinghandler.h index cb8f8c248..9a20384ad 100644 --- a/src/net/eathena/beinghandler.h +++ b/src/net/eathena/beinghandler.h @@ -35,7 +35,7 @@ class BeingHandler final : public Ea::BeingHandler A_DELETE_COPY(BeingHandler) - ~BeingHandler(); + ~BeingHandler() override final; void requestNameById(const BeingId id) const override final; diff --git a/src/net/eathena/buyingstorehandler.h b/src/net/eathena/buyingstorehandler.h index 8aed152c9..6802c760a 100644 --- a/src/net/eathena/buyingstorehandler.h +++ b/src/net/eathena/buyingstorehandler.h @@ -32,7 +32,7 @@ class BuyingStoreHandler final : public Net::BuyingStoreHandler A_DELETE_COPY(BuyingStoreHandler) - ~BuyingStoreHandler(); + ~BuyingStoreHandler() override final; void create(const std::string &name, const int maxMoney, diff --git a/src/net/eathena/buysellhandler.h b/src/net/eathena/buysellhandler.h index b7aea35c7..7a0cfa99e 100644 --- a/src/net/eathena/buysellhandler.h +++ b/src/net/eathena/buysellhandler.h @@ -35,7 +35,7 @@ class BuySellHandler final : public Ea::BuySellHandler A_DELETE_COPY(BuySellHandler) - ~BuySellHandler(); + ~BuySellHandler() override final; void requestSellList(const std::string &nick) const override final A_CONST; diff --git a/src/net/eathena/cashshophandler.h b/src/net/eathena/cashshophandler.h index 7294b5cae..c6b78102a 100644 --- a/src/net/eathena/cashshophandler.h +++ b/src/net/eathena/cashshophandler.h @@ -32,7 +32,7 @@ class CashShopHandler final : public Net::CashShopHandler A_DELETE_COPY(CashShopHandler) - ~CashShopHandler(); + ~CashShopHandler() override final; void buyItem(const int points, const int itemId, diff --git a/src/net/eathena/charserverhandler.h b/src/net/eathena/charserverhandler.h index cef8f868e..b3dde674a 100644 --- a/src/net/eathena/charserverhandler.h +++ b/src/net/eathena/charserverhandler.h @@ -38,7 +38,7 @@ class CharServerHandler final : public Ea::CharServerHandler A_DELETE_COPY(CharServerHandler) - ~CharServerHandler(); + ~CharServerHandler() override final; void chooseCharacter(Net::Character *const character) const override final; diff --git a/src/net/eathena/chathandler.h b/src/net/eathena/chathandler.h index 685327cd3..fe41d395f 100644 --- a/src/net/eathena/chathandler.h +++ b/src/net/eathena/chathandler.h @@ -36,7 +36,7 @@ class ChatHandler final : public Ea::ChatHandler A_DELETE_COPY(ChatHandler) - ~ChatHandler(); + ~ChatHandler() override final; void talk(const std::string &restrict text, const std::string &restrict channel) const override final; diff --git a/src/net/eathena/elementalhandler.h b/src/net/eathena/elementalhandler.h index 517b74a30..9ec6fe396 100644 --- a/src/net/eathena/elementalhandler.h +++ b/src/net/eathena/elementalhandler.h @@ -32,7 +32,7 @@ class ElementalHandler final : public Net::ElementalHandler A_DELETE_COPY(ElementalHandler) - ~ElementalHandler(); + ~ElementalHandler() override final; }; } // namespace EAthena diff --git a/src/net/eathena/familyhandler.h b/src/net/eathena/familyhandler.h index 91531fb2d..c97b3467a 100644 --- a/src/net/eathena/familyhandler.h +++ b/src/net/eathena/familyhandler.h @@ -32,7 +32,7 @@ class FamilyHandler final : public Net::FamilyHandler A_DELETE_COPY(FamilyHandler) - ~FamilyHandler(); + ~FamilyHandler() override final; void askForChild(const Being *const being) const override final; diff --git a/src/net/eathena/friendshandler.h b/src/net/eathena/friendshandler.h index 7b985e0ca..35d2745e1 100644 --- a/src/net/eathena/friendshandler.h +++ b/src/net/eathena/friendshandler.h @@ -32,7 +32,7 @@ class FriendsHandler final : public Net::FriendsHandler A_DELETE_COPY(FriendsHandler) - ~FriendsHandler(); + ~FriendsHandler() override final; void invite(const std::string &name) const override final; diff --git a/src/net/eathena/gamehandler.h b/src/net/eathena/gamehandler.h index 4b2725a2f..4c2eb8a00 100644 --- a/src/net/eathena/gamehandler.h +++ b/src/net/eathena/gamehandler.h @@ -35,7 +35,7 @@ class GameHandler final : public Ea::GameHandler A_DELETE_COPY(GameHandler) - ~GameHandler(); + ~GameHandler() override final; void connect() const override final; diff --git a/src/net/eathena/generalhandler.h b/src/net/eathena/generalhandler.h index c4ff43402..62bceeb2c 100644 --- a/src/net/eathena/generalhandler.h +++ b/src/net/eathena/generalhandler.h @@ -71,7 +71,7 @@ class GeneralHandler final : public Net::GeneralHandler A_DELETE_COPY(GeneralHandler) - ~GeneralHandler(); + ~GeneralHandler() override final; void load() const override final; diff --git a/src/net/eathena/guildhandler.h b/src/net/eathena/guildhandler.h index b9475f1b8..e81f06bfa 100644 --- a/src/net/eathena/guildhandler.h +++ b/src/net/eathena/guildhandler.h @@ -36,7 +36,7 @@ class GuildHandler final : public Net::GuildHandler A_DELETE_COPY(GuildHandler) - ~GuildHandler(); + ~GuildHandler() override final; void clear() const override final; diff --git a/src/net/eathena/homunculushandler.h b/src/net/eathena/homunculushandler.h index 817c6ee75..2c6d9bd55 100644 --- a/src/net/eathena/homunculushandler.h +++ b/src/net/eathena/homunculushandler.h @@ -32,7 +32,7 @@ class HomunculusHandler final : public Net::HomunculusHandler A_DELETE_COPY(HomunculusHandler) - ~HomunculusHandler(); + ~HomunculusHandler() override final; void setName(const std::string &name) const override final; diff --git a/src/net/eathena/inventoryhandler.h b/src/net/eathena/inventoryhandler.h index 79155ddaa..c5f43870c 100644 --- a/src/net/eathena/inventoryhandler.h +++ b/src/net/eathena/inventoryhandler.h @@ -35,7 +35,7 @@ class InventoryHandler final : public Ea::InventoryHandler A_DELETE_COPY(InventoryHandler) - ~InventoryHandler(); + ~InventoryHandler() override final; void equipItem(const Item *const item) const override final; diff --git a/src/net/eathena/loginhandler.h b/src/net/eathena/loginhandler.h index f9201e8fd..667fc46b2 100644 --- a/src/net/eathena/loginhandler.h +++ b/src/net/eathena/loginhandler.h @@ -35,7 +35,7 @@ class LoginHandler final : public Ea::LoginHandler A_DELETE_COPY(LoginHandler) - ~LoginHandler(); + ~LoginHandler() override final; void connect() const override final; diff --git a/src/net/eathena/mail2handler.h b/src/net/eathena/mail2handler.h index c7d15dc78..6b99f4770 100644 --- a/src/net/eathena/mail2handler.h +++ b/src/net/eathena/mail2handler.h @@ -33,7 +33,7 @@ class Mail2Handler final : public Net::Mail2Handler A_DELETE_COPY(Mail2Handler) - ~Mail2Handler(); + ~Mail2Handler() override final; void openWriteMail(const std::string &receiver) const override final; diff --git a/src/net/eathena/mailhandler.h b/src/net/eathena/mailhandler.h index 4d55238a6..027d5d648 100644 --- a/src/net/eathena/mailhandler.h +++ b/src/net/eathena/mailhandler.h @@ -33,7 +33,7 @@ class MailHandler final : public Net::MailHandler A_DELETE_COPY(MailHandler) - ~MailHandler(); + ~MailHandler() override final; void refresh() const override final; diff --git a/src/net/eathena/maphandler.h b/src/net/eathena/maphandler.h index 855ec4da7..d99a48890 100644 --- a/src/net/eathena/maphandler.h +++ b/src/net/eathena/maphandler.h @@ -33,7 +33,7 @@ class MapHandler final : public Net::MapHandler A_DELETE_COPY(MapHandler) - ~MapHandler(); + ~MapHandler() override final; }; } // namespace EAthena diff --git a/src/net/eathena/markethandler.h b/src/net/eathena/markethandler.h index c06018c0b..482127093 100644 --- a/src/net/eathena/markethandler.h +++ b/src/net/eathena/markethandler.h @@ -33,7 +33,7 @@ class MarketHandler final : public Net::MarketHandler A_DELETE_COPY(MarketHandler) - ~MarketHandler(); + ~MarketHandler() override final; void close() const override final; diff --git a/src/net/eathena/mercenaryhandler.h b/src/net/eathena/mercenaryhandler.h index bd5e06b14..8dd99e2c2 100644 --- a/src/net/eathena/mercenaryhandler.h +++ b/src/net/eathena/mercenaryhandler.h @@ -32,7 +32,7 @@ class MercenaryHandler final : public Net::MercenaryHandler A_DELETE_COPY(MercenaryHandler) - ~MercenaryHandler(); + ~MercenaryHandler() override final; void fire() const override final; diff --git a/src/net/eathena/messageout.h b/src/net/eathena/messageout.h index 38525bad7..86a205e62 100644 --- a/src/net/eathena/messageout.h +++ b/src/net/eathena/messageout.h @@ -47,7 +47,7 @@ class MessageOut final : public Net::MessageOut A_DELETE_COPY(MessageOut) - virtual ~MessageOut(); + ~MessageOut() override final; /**< Writes a short. */ void writeInt16(const int16_t value, diff --git a/src/net/eathena/network.h b/src/net/eathena/network.h index acd377be3..8a5945e76 100644 --- a/src/net/eathena/network.h +++ b/src/net/eathena/network.h @@ -41,7 +41,7 @@ class Network final : public Ea::Network A_DELETE_COPY(Network) - ~Network(); + ~Network() override final; void clearHandlers(); diff --git a/src/net/eathena/npchandler.h b/src/net/eathena/npchandler.h index e5177d7c9..7c9d63894 100644 --- a/src/net/eathena/npchandler.h +++ b/src/net/eathena/npchandler.h @@ -35,7 +35,7 @@ class NpcHandler final : public Ea::NpcHandler A_DELETE_COPY(NpcHandler) - ~NpcHandler(); + ~NpcHandler() override final; void talk(const Being *const being) const override final; diff --git a/src/net/eathena/partyhandler.h b/src/net/eathena/partyhandler.h index 4b87f09fd..5811bf07b 100644 --- a/src/net/eathena/partyhandler.h +++ b/src/net/eathena/partyhandler.h @@ -34,7 +34,7 @@ class PartyHandler final : public Ea::PartyHandler A_DELETE_COPY(PartyHandler) - ~PartyHandler(); + ~PartyHandler() override final; void create(const std::string &name) const override final; diff --git a/src/net/eathena/pethandler.h b/src/net/eathena/pethandler.h index 9785ade7d..587172841 100644 --- a/src/net/eathena/pethandler.h +++ b/src/net/eathena/pethandler.h @@ -33,7 +33,7 @@ class PetHandler final : public Net::PetHandler A_DELETE_COPY(PetHandler) - ~PetHandler(); + ~PetHandler() override final; void move(const int x, const int y) const override final; diff --git a/src/net/eathena/playerhandler.h b/src/net/eathena/playerhandler.h index b51ad2e92..737db4a03 100644 --- a/src/net/eathena/playerhandler.h +++ b/src/net/eathena/playerhandler.h @@ -35,7 +35,7 @@ class PlayerHandler final : public Ea::PlayerHandler A_DELETE_COPY(PlayerHandler) - ~PlayerHandler(); + ~PlayerHandler() override final; void attack(const BeingId id, const Keep keep) const override final; diff --git a/src/net/eathena/questhandler.h b/src/net/eathena/questhandler.h index 2c5f18b67..cacd06cd6 100644 --- a/src/net/eathena/questhandler.h +++ b/src/net/eathena/questhandler.h @@ -33,7 +33,7 @@ class QuestHandler final : public Net::QuestHandler A_DELETE_COPY(QuestHandler) - ~QuestHandler(); + ~QuestHandler() override final; void setQeustActiveState(const int questId, const bool active) const override final; diff --git a/src/net/eathena/roulettehandler.h b/src/net/eathena/roulettehandler.h index 861f54582..f44818540 100644 --- a/src/net/eathena/roulettehandler.h +++ b/src/net/eathena/roulettehandler.h @@ -32,7 +32,7 @@ class RouletteHandler final : public Net::RouletteHandler A_DELETE_COPY(RouletteHandler) - ~RouletteHandler(); + ~RouletteHandler() override final; }; } // namespace EAthena diff --git a/src/net/eathena/searchstorehandler.h b/src/net/eathena/searchstorehandler.h index 5e425e6e5..1e4360f16 100644 --- a/src/net/eathena/searchstorehandler.h +++ b/src/net/eathena/searchstorehandler.h @@ -32,7 +32,7 @@ class SearchStoreHandler final : public Net::SearchStoreHandler A_DELETE_COPY(SearchStoreHandler) - ~SearchStoreHandler(); + ~SearchStoreHandler() override final; void search(const StoreSearchTypeT type, const int minPrice, diff --git a/src/net/eathena/skillhandler.h b/src/net/eathena/skillhandler.h index d615dac77..326c17b06 100644 --- a/src/net/eathena/skillhandler.h +++ b/src/net/eathena/skillhandler.h @@ -35,7 +35,7 @@ class SkillHandler final : public Ea::SkillHandler A_DELETE_COPY(SkillHandler) - ~SkillHandler(); + ~SkillHandler() override final; void useBeing(const int id, const int level, diff --git a/src/net/eathena/tradehandler.h b/src/net/eathena/tradehandler.h index 0bf5b2eb2..3dee8ecdf 100644 --- a/src/net/eathena/tradehandler.h +++ b/src/net/eathena/tradehandler.h @@ -35,7 +35,7 @@ class TradeHandler final : public Ea::TradeHandler A_DELETE_COPY(TradeHandler) - ~TradeHandler(); + ~TradeHandler() override final; void request(const Being *const being) const override final; diff --git a/src/net/eathena/vendinghandler.h b/src/net/eathena/vendinghandler.h index 7929a6d19..38c9ce87d 100644 --- a/src/net/eathena/vendinghandler.h +++ b/src/net/eathena/vendinghandler.h @@ -32,7 +32,7 @@ class VendingHandler final : public Net::VendingHandler A_DELETE_COPY(VendingHandler) - ~VendingHandler(); + ~VendingHandler() override final; void close() const override final; diff --git a/src/net/tmwa/adminhandler.h b/src/net/tmwa/adminhandler.h index 01e7adcac..3d46ec0ef 100644 --- a/src/net/tmwa/adminhandler.h +++ b/src/net/tmwa/adminhandler.h @@ -35,7 +35,7 @@ class AdminHandler final : public Ea::AdminHandler A_DELETE_COPY(AdminHandler) - ~AdminHandler(); + ~AdminHandler() override final; void announce(const std::string &text) const override final; diff --git a/src/net/tmwa/auctionhandler.h b/src/net/tmwa/auctionhandler.h index 9e88e603d..907328952 100644 --- a/src/net/tmwa/auctionhandler.h +++ b/src/net/tmwa/auctionhandler.h @@ -32,7 +32,7 @@ class AuctionHandler final : public Net::AuctionHandler A_DELETE_COPY(AuctionHandler) - ~AuctionHandler(); + ~AuctionHandler() override final; void cancelReg() const override final A_CONST; diff --git a/src/net/tmwa/bankhandler.h b/src/net/tmwa/bankhandler.h index a99b7d50d..44e701e25 100644 --- a/src/net/tmwa/bankhandler.h +++ b/src/net/tmwa/bankhandler.h @@ -33,7 +33,7 @@ class BankHandler final : public Net::BankHandler A_DELETE_COPY(BankHandler) - ~BankHandler(); + ~BankHandler() override final; void deposit(const int money) const override final A_CONST; diff --git a/src/net/tmwa/battlegroundhandler.h b/src/net/tmwa/battlegroundhandler.h index 2a1126589..b1431a29a 100644 --- a/src/net/tmwa/battlegroundhandler.h +++ b/src/net/tmwa/battlegroundhandler.h @@ -33,7 +33,7 @@ class BattleGroundHandler final : public Net::BattleGroundHandler A_DELETE_COPY(BattleGroundHandler) - ~BattleGroundHandler(); + ~BattleGroundHandler() override final; void registerBg(const BattleGroundTypeT &type, const std::string &name) const override final A_CONST; diff --git a/src/net/tmwa/beinghandler.h b/src/net/tmwa/beinghandler.h index 04cced3ed..50699a169 100644 --- a/src/net/tmwa/beinghandler.h +++ b/src/net/tmwa/beinghandler.h @@ -35,7 +35,7 @@ class BeingHandler final : public Ea::BeingHandler A_DELETE_COPY(BeingHandler) - ~BeingHandler(); + ~BeingHandler() override final; void requestNameById(const BeingId id) const override final; diff --git a/src/net/tmwa/buyingstorehandler.h b/src/net/tmwa/buyingstorehandler.h index 584293021..9db5938ae 100644 --- a/src/net/tmwa/buyingstorehandler.h +++ b/src/net/tmwa/buyingstorehandler.h @@ -33,7 +33,7 @@ class BuyingStoreHandler final : public Net::BuyingStoreHandler A_DELETE_COPY(BuyingStoreHandler) - ~BuyingStoreHandler(); + ~BuyingStoreHandler() override final; void create(const std::string &name, const int maxMoney, diff --git a/src/net/tmwa/buysellhandler.h b/src/net/tmwa/buysellhandler.h index 461935cda..7b8b43ca7 100644 --- a/src/net/tmwa/buysellhandler.h +++ b/src/net/tmwa/buysellhandler.h @@ -35,7 +35,7 @@ class BuySellHandler final : public Ea::BuySellHandler A_DELETE_COPY(BuySellHandler) - ~BuySellHandler(); + ~BuySellHandler() override final; void requestSellList(const std::string &nick) const override final; diff --git a/src/net/tmwa/cashshophandler.h b/src/net/tmwa/cashshophandler.h index 31d5872dd..68fd8b41d 100644 --- a/src/net/tmwa/cashshophandler.h +++ b/src/net/tmwa/cashshophandler.h @@ -33,7 +33,7 @@ class CashShopHandler final : public Net::CashShopHandler A_DELETE_COPY(CashShopHandler) - ~CashShopHandler(); + ~CashShopHandler() override final; void buyItem(const int points, const int itemId, diff --git a/src/net/tmwa/charserverhandler.h b/src/net/tmwa/charserverhandler.h index e71fdb1b9..aa5b660f1 100644 --- a/src/net/tmwa/charserverhandler.h +++ b/src/net/tmwa/charserverhandler.h @@ -38,7 +38,7 @@ class CharServerHandler final : public Ea::CharServerHandler A_DELETE_COPY(CharServerHandler) - ~CharServerHandler(); + ~CharServerHandler() override final; void chooseCharacter(Net::Character *const character) const override final; diff --git a/src/net/tmwa/chathandler.h b/src/net/tmwa/chathandler.h index 12de8067c..f03e4029f 100644 --- a/src/net/tmwa/chathandler.h +++ b/src/net/tmwa/chathandler.h @@ -36,7 +36,7 @@ class ChatHandler final : public Ea::ChatHandler A_DELETE_COPY(ChatHandler) - ~ChatHandler(); + ~ChatHandler() override final; void talk(const std::string &restrict text, const std::string &restrict channel) const override final; diff --git a/src/net/tmwa/elementalhandler.h b/src/net/tmwa/elementalhandler.h index 5aea5b5d2..fc4e13485 100644 --- a/src/net/tmwa/elementalhandler.h +++ b/src/net/tmwa/elementalhandler.h @@ -32,7 +32,7 @@ namespace TmwAthena A_DELETE_COPY(ElementalHandler) - ~ElementalHandler(); + ~ElementalHandler() override final; }; } // namespace TmwAthena diff --git a/src/net/tmwa/familyhandler.h b/src/net/tmwa/familyhandler.h index b2cc6c96a..f8ad60037 100644 --- a/src/net/tmwa/familyhandler.h +++ b/src/net/tmwa/familyhandler.h @@ -33,7 +33,7 @@ class FamilyHandler final : public Net::FamilyHandler A_DELETE_COPY(FamilyHandler) - ~FamilyHandler(); + ~FamilyHandler() override final; void askForChild(const Being *const being) const override final A_CONST; diff --git a/src/net/tmwa/friendshandler.h b/src/net/tmwa/friendshandler.h index ef9d05c60..9a491f62f 100644 --- a/src/net/tmwa/friendshandler.h +++ b/src/net/tmwa/friendshandler.h @@ -32,7 +32,7 @@ class FriendsHandler final : public Net::FriendsHandler A_DELETE_COPY(FriendsHandler) - ~FriendsHandler(); + ~FriendsHandler() override final; void invite(const std::string &name) const override final A_CONST; diff --git a/src/net/tmwa/gamehandler.h b/src/net/tmwa/gamehandler.h index 78d30e7e3..eef214e8c 100644 --- a/src/net/tmwa/gamehandler.h +++ b/src/net/tmwa/gamehandler.h @@ -35,7 +35,7 @@ class GameHandler final : public Ea::GameHandler A_DELETE_COPY(GameHandler) - ~GameHandler(); + ~GameHandler() override final; void connect() const override final; diff --git a/src/net/tmwa/generalhandler.h b/src/net/tmwa/generalhandler.h index 818cb4be3..a060a5784 100644 --- a/src/net/tmwa/generalhandler.h +++ b/src/net/tmwa/generalhandler.h @@ -70,7 +70,7 @@ class GeneralHandler final : public Net::GeneralHandler A_DELETE_COPY(GeneralHandler) - ~GeneralHandler(); + ~GeneralHandler() override final; void load() const override final; diff --git a/src/net/tmwa/guildhandler.h b/src/net/tmwa/guildhandler.h index dcb9d6b7c..b0d940b8b 100644 --- a/src/net/tmwa/guildhandler.h +++ b/src/net/tmwa/guildhandler.h @@ -34,7 +34,7 @@ class GuildHandler final : public Net::GuildHandler A_DELETE_COPY(GuildHandler) - ~GuildHandler(); + ~GuildHandler() override final; void clear() const override final; diff --git a/src/net/tmwa/homunculushandler.h b/src/net/tmwa/homunculushandler.h index bd00927fa..8cc6936d0 100644 --- a/src/net/tmwa/homunculushandler.h +++ b/src/net/tmwa/homunculushandler.h @@ -33,7 +33,7 @@ class HomunculusHandler final : public Net::HomunculusHandler A_DELETE_COPY(HomunculusHandler) - ~HomunculusHandler(); + ~HomunculusHandler() override final; void setName(const std::string &name) const override final A_CONST; diff --git a/src/net/tmwa/inventoryhandler.h b/src/net/tmwa/inventoryhandler.h index 5bf67f9f1..6dc461545 100644 --- a/src/net/tmwa/inventoryhandler.h +++ b/src/net/tmwa/inventoryhandler.h @@ -35,7 +35,7 @@ class InventoryHandler final : public Ea::InventoryHandler A_DELETE_COPY(InventoryHandler) - ~InventoryHandler(); + ~InventoryHandler() override final; void equipItem(const Item *const item) const override final; diff --git a/src/net/tmwa/loginhandler.h b/src/net/tmwa/loginhandler.h index dddbd88e9..f4d752374 100644 --- a/src/net/tmwa/loginhandler.h +++ b/src/net/tmwa/loginhandler.h @@ -35,7 +35,7 @@ class LoginHandler final : public Ea::LoginHandler A_DELETE_COPY(LoginHandler) - ~LoginHandler(); + ~LoginHandler() override final; void connect() const override final; diff --git a/src/net/tmwa/mail2handler.h b/src/net/tmwa/mail2handler.h index 003a29b89..d74553228 100644 --- a/src/net/tmwa/mail2handler.h +++ b/src/net/tmwa/mail2handler.h @@ -33,7 +33,7 @@ class Mail2Handler final : public Net::Mail2Handler A_DELETE_COPY(Mail2Handler) - ~Mail2Handler(); + ~Mail2Handler() override final; void openWriteMail(const std::string &receiver) const override final; diff --git a/src/net/tmwa/mailhandler.h b/src/net/tmwa/mailhandler.h index 94867a7a7..860fb3599 100644 --- a/src/net/tmwa/mailhandler.h +++ b/src/net/tmwa/mailhandler.h @@ -33,7 +33,7 @@ class MailHandler final : public Net::MailHandler A_DELETE_COPY(MailHandler) - ~MailHandler(); + ~MailHandler() override final; void refresh() const override final A_CONST; diff --git a/src/net/tmwa/maphandler.h b/src/net/tmwa/maphandler.h index 10382222d..ab7db1cd6 100644 --- a/src/net/tmwa/maphandler.h +++ b/src/net/tmwa/maphandler.h @@ -33,7 +33,7 @@ class MapHandler final : public Net::MapHandler A_DELETE_COPY(MapHandler) - ~MapHandler(); + ~MapHandler() override final; }; } // namespace TmwAthena diff --git a/src/net/tmwa/markethandler.h b/src/net/tmwa/markethandler.h index 923b697c0..ea81cb9e5 100644 --- a/src/net/tmwa/markethandler.h +++ b/src/net/tmwa/markethandler.h @@ -32,7 +32,7 @@ class MarketHandler final : public Net::MarketHandler A_DELETE_COPY(MarketHandler) - ~MarketHandler(); + ~MarketHandler() override final; void close() const override final A_CONST; diff --git a/src/net/tmwa/mercenaryhandler.h b/src/net/tmwa/mercenaryhandler.h index eaba1f2fd..cfb4e66d1 100644 --- a/src/net/tmwa/mercenaryhandler.h +++ b/src/net/tmwa/mercenaryhandler.h @@ -33,7 +33,7 @@ class MercenaryHandler final : public Net::MercenaryHandler A_DELETE_COPY(MercenaryHandler) - ~MercenaryHandler(); + ~MercenaryHandler() override final; void fire() const override final A_CONST; diff --git a/src/net/tmwa/messageout.h b/src/net/tmwa/messageout.h index 18346b690..2a5251702 100644 --- a/src/net/tmwa/messageout.h +++ b/src/net/tmwa/messageout.h @@ -47,7 +47,7 @@ class MessageOut final : public Net::MessageOut A_DELETE_COPY(MessageOut) - virtual ~MessageOut(); + ~MessageOut() override final; /**< Writes a short. */ void writeInt16(const int16_t value, diff --git a/src/net/tmwa/network.h b/src/net/tmwa/network.h index 26a2a1650..60dbb6b34 100644 --- a/src/net/tmwa/network.h +++ b/src/net/tmwa/network.h @@ -40,7 +40,7 @@ class Network final : public Ea::Network A_DELETE_COPY(Network) - ~Network(); + ~Network() override final; void clearHandlers(); diff --git a/src/net/tmwa/npchandler.h b/src/net/tmwa/npchandler.h index 14bfefb66..0e038586d 100644 --- a/src/net/tmwa/npchandler.h +++ b/src/net/tmwa/npchandler.h @@ -35,7 +35,7 @@ class NpcHandler final : public Ea::NpcHandler A_DELETE_COPY(NpcHandler) - ~NpcHandler(); + ~NpcHandler() override final; void talk(const Being *const being) const override final; diff --git a/src/net/tmwa/partyhandler.h b/src/net/tmwa/partyhandler.h index 4942bfc86..7fcb428f0 100644 --- a/src/net/tmwa/partyhandler.h +++ b/src/net/tmwa/partyhandler.h @@ -34,7 +34,7 @@ class PartyHandler final : public Ea::PartyHandler A_DELETE_COPY(PartyHandler) - ~PartyHandler(); + ~PartyHandler() override final; void create(const std::string &name) const override final; diff --git a/src/net/tmwa/pethandler.h b/src/net/tmwa/pethandler.h index e7a816d21..d2dce8e75 100644 --- a/src/net/tmwa/pethandler.h +++ b/src/net/tmwa/pethandler.h @@ -33,7 +33,7 @@ class PetHandler final : public Net::PetHandler A_DELETE_COPY(PetHandler) - ~PetHandler(); + ~PetHandler() override final; void move(const int x, const int y) const override final; diff --git a/src/net/tmwa/playerhandler.h b/src/net/tmwa/playerhandler.h index e0b5be486..daef9ebb7 100644 --- a/src/net/tmwa/playerhandler.h +++ b/src/net/tmwa/playerhandler.h @@ -35,7 +35,7 @@ class PlayerHandler final : public Ea::PlayerHandler A_DELETE_COPY(PlayerHandler) - ~PlayerHandler(); + ~PlayerHandler() override final; void attack(const BeingId id, const Keep keep) const override final; diff --git a/src/net/tmwa/questhandler.h b/src/net/tmwa/questhandler.h index 4c56ef0c9..aa484199f 100644 --- a/src/net/tmwa/questhandler.h +++ b/src/net/tmwa/questhandler.h @@ -33,7 +33,7 @@ class QuestHandler final : public Net::QuestHandler A_DELETE_COPY(QuestHandler) - ~QuestHandler(); + ~QuestHandler() override final; void setQeustActiveState(const int questId, const bool active) const override final diff --git a/src/net/tmwa/roulettehandler.h b/src/net/tmwa/roulettehandler.h index b575d3ca3..a2fc2f3f8 100644 --- a/src/net/tmwa/roulettehandler.h +++ b/src/net/tmwa/roulettehandler.h @@ -32,7 +32,7 @@ class RouletteHandler final : public Net::RouletteHandler A_DELETE_COPY(RouletteHandler) - ~RouletteHandler(); + ~RouletteHandler() override final; }; } // namespace TmwAthena diff --git a/src/net/tmwa/searchstorehandler.h b/src/net/tmwa/searchstorehandler.h index 20112fcb1..0c996b384 100644 --- a/src/net/tmwa/searchstorehandler.h +++ b/src/net/tmwa/searchstorehandler.h @@ -32,7 +32,7 @@ class SearchStoreHandler final : public Net::SearchStoreHandler A_DELETE_COPY(SearchStoreHandler) - ~SearchStoreHandler(); + ~SearchStoreHandler() override final; void search(const StoreSearchTypeT type, const int minPrice, diff --git a/src/net/tmwa/skillhandler.h b/src/net/tmwa/skillhandler.h index 324774bea..0e555b13a 100644 --- a/src/net/tmwa/skillhandler.h +++ b/src/net/tmwa/skillhandler.h @@ -35,7 +35,7 @@ class SkillHandler final : public Ea::SkillHandler A_DELETE_COPY(SkillHandler) - ~SkillHandler(); + ~SkillHandler() override final; void useBeing(const int id, const int level, diff --git a/src/net/tmwa/tradehandler.h b/src/net/tmwa/tradehandler.h index b8538f1bc..0fbb7edd3 100644 --- a/src/net/tmwa/tradehandler.h +++ b/src/net/tmwa/tradehandler.h @@ -35,7 +35,7 @@ class TradeHandler final : public Ea::TradeHandler A_DELETE_COPY(TradeHandler) - ~TradeHandler(); + ~TradeHandler() override final; void request(const Being *const being) const override final; diff --git a/src/net/tmwa/vendinghandler.h b/src/net/tmwa/vendinghandler.h index 3af4a110b..9048c7c99 100644 --- a/src/net/tmwa/vendinghandler.h +++ b/src/net/tmwa/vendinghandler.h @@ -33,7 +33,7 @@ class VendingHandler final : public Net::VendingHandler A_DELETE_COPY(VendingHandler) - ~VendingHandler(); + ~VendingHandler() override final; void close() const override final A_CONST; |