From 499a0bc5b9c7d57c227eaf16d11b14865bd066d5 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 31 May 2014 16:08:42 +0300 Subject: Add missing notfinal/final to classes. --- src/net/ea/adminhandler.h | 2 +- src/net/ea/beinghandler.h | 2 +- src/net/ea/buysellhandler.h | 2 +- src/net/ea/charserverhandler.h | 2 +- src/net/ea/chathandler.h | 2 +- src/net/ea/equipbackend.h | 2 +- src/net/ea/gamehandler.h | 2 +- src/net/ea/gui/guildtab.h | 4 ++-- src/net/ea/gui/partytab.h | 4 ++-- src/net/ea/guildhandler.h | 2 +- src/net/ea/inventoryhandler.h | 2 +- src/net/ea/loginhandler.cpp | 2 ++ src/net/ea/loginhandler.h | 2 +- src/net/ea/npchandler.h | 2 +- src/net/ea/partyhandler.h | 2 +- src/net/ea/playerhandler.h | 2 +- src/net/ea/skillhandler.h | 2 +- src/net/ea/token.h | 4 ++-- src/net/ea/tradehandler.h | 2 +- src/net/eathena/gui/guildtab.h | 2 +- src/net/eathena/gui/partytab.h | 2 +- src/net/eathena/messagehandler.h | 2 +- src/net/messagein.h | 2 +- src/net/tmwa/gui/guildtab.h | 2 +- src/net/tmwa/messagehandler.h | 2 +- 25 files changed, 29 insertions(+), 27 deletions(-) (limited to 'src/net') diff --git a/src/net/ea/adminhandler.h b/src/net/ea/adminhandler.h index 5ec72e912..6bf7c4b13 100644 --- a/src/net/ea/adminhandler.h +++ b/src/net/ea/adminhandler.h @@ -30,7 +30,7 @@ namespace Ea { -class AdminHandler : public Net::AdminHandler +class AdminHandler notfinal : public Net::AdminHandler { public: AdminHandler() diff --git a/src/net/ea/beinghandler.h b/src/net/ea/beinghandler.h index 4d59c2f48..b460ae358 100644 --- a/src/net/ea/beinghandler.h +++ b/src/net/ea/beinghandler.h @@ -28,7 +28,7 @@ namespace Ea { -class BeingHandler : public Net::BeingHandler +class BeingHandler notfinal : public Net::BeingHandler { public: A_DELETE_COPY(BeingHandler) diff --git a/src/net/ea/buysellhandler.h b/src/net/ea/buysellhandler.h index 0aa984d43..75e78a251 100644 --- a/src/net/ea/buysellhandler.h +++ b/src/net/ea/buysellhandler.h @@ -30,7 +30,7 @@ class BuyDialog; namespace Ea { -class BuySellHandler : public Net::BuySellHandler +class BuySellHandler notfinal : public Net::BuySellHandler { public: BuySellHandler(); diff --git a/src/net/ea/charserverhandler.h b/src/net/ea/charserverhandler.h index af6aafa9b..ffbb97bc8 100644 --- a/src/net/ea/charserverhandler.h +++ b/src/net/ea/charserverhandler.h @@ -40,7 +40,7 @@ class Network; /** * Deals with incoming messages from the character server. */ -class CharServerHandler : public Net::CharServerHandler +class CharServerHandler notfinal : public Net::CharServerHandler { public: A_DELETE_COPY(CharServerHandler) diff --git a/src/net/ea/chathandler.h b/src/net/ea/chathandler.h index 237abf10a..708d79440 100644 --- a/src/net/ea/chathandler.h +++ b/src/net/ea/chathandler.h @@ -35,7 +35,7 @@ namespace Net namespace Ea { -class ChatHandler : public Net::ChatHandler +class ChatHandler notfinal : public Net::ChatHandler { public: ChatHandler(); diff --git a/src/net/ea/equipbackend.h b/src/net/ea/equipbackend.h index 5a557eaa6..fb06cf7e2 100644 --- a/src/net/ea/equipbackend.h +++ b/src/net/ea/equipbackend.h @@ -33,7 +33,7 @@ namespace Ea { -class EquipBackend : public Equipment::Backend +class EquipBackend final : public Equipment::Backend { public: EquipBackend() diff --git a/src/net/ea/gamehandler.h b/src/net/ea/gamehandler.h index 4a0624be0..a10b244c7 100644 --- a/src/net/ea/gamehandler.h +++ b/src/net/ea/gamehandler.h @@ -33,7 +33,7 @@ namespace Net namespace Ea { -class GameHandler : public Net::GameHandler +class GameHandler notfinal : public Net::GameHandler { public: GameHandler(); diff --git a/src/net/ea/gui/guildtab.h b/src/net/ea/gui/guildtab.h index c3936f348..f9bc24b7a 100644 --- a/src/net/ea/gui/guildtab.h +++ b/src/net/ea/gui/guildtab.h @@ -32,8 +32,8 @@ namespace Ea /** * A tab for a guild chat channel. */ -class GuildTab : public ChatTab, - public ConfigListener +class GuildTab notfinal : public ChatTab, + public ConfigListener { public: explicit GuildTab(const Widget2 *const widget); diff --git a/src/net/ea/gui/partytab.h b/src/net/ea/gui/partytab.h index 1a08d0954..7a82b1ae0 100644 --- a/src/net/ea/gui/partytab.h +++ b/src/net/ea/gui/partytab.h @@ -32,8 +32,8 @@ namespace Ea /** * A tab for a party chat channel. */ -class PartyTab : public ChatTab, - public ConfigListener +class PartyTab notfinal : public ChatTab, + public ConfigListener { public: explicit PartyTab(const Widget2 *const widget); diff --git a/src/net/ea/guildhandler.h b/src/net/ea/guildhandler.h index e8bec6a09..48e5f325f 100644 --- a/src/net/ea/guildhandler.h +++ b/src/net/ea/guildhandler.h @@ -33,7 +33,7 @@ namespace Ea { class GuildTab; -class GuildHandler : public Net::GuildHandler +class GuildHandler notfinal : public Net::GuildHandler { public: GuildHandler(); diff --git a/src/net/ea/inventoryhandler.h b/src/net/ea/inventoryhandler.h index e26878f65..76ceec765 100644 --- a/src/net/ea/inventoryhandler.h +++ b/src/net/ea/inventoryhandler.h @@ -44,7 +44,7 @@ namespace Ea typedef std::vector InventoryItems; -class InventoryHandler : public Net::InventoryHandler +class InventoryHandler notfinal : public Net::InventoryHandler { public: enum diff --git a/src/net/ea/loginhandler.cpp b/src/net/ea/loginhandler.cpp index ecc51bfeb..451850430 100644 --- a/src/net/ea/loginhandler.cpp +++ b/src/net/ea/loginhandler.cpp @@ -27,6 +27,8 @@ #include "logger.h" #include "settings.h" +#include "being/being.h" + #include "gui/windows/logindialog.h" #include "utils/dtor.h" diff --git a/src/net/ea/loginhandler.h b/src/net/ea/loginhandler.h index 053e8500a..6040e72fd 100644 --- a/src/net/ea/loginhandler.h +++ b/src/net/ea/loginhandler.h @@ -41,7 +41,7 @@ namespace Net namespace Ea { -class LoginHandler : public Net::LoginHandler +class LoginHandler notfinal : public Net::LoginHandler { public: A_DELETE_COPY(LoginHandler) diff --git a/src/net/ea/npchandler.h b/src/net/ea/npchandler.h index 07c281587..d6986a219 100644 --- a/src/net/ea/npchandler.h +++ b/src/net/ea/npchandler.h @@ -37,7 +37,7 @@ namespace Net namespace Ea { -class NpcHandler : public Net::NpcHandler +class NpcHandler notfinal : public Net::NpcHandler { public: A_DELETE_COPY(NpcHandler) diff --git a/src/net/ea/partyhandler.h b/src/net/ea/partyhandler.h index 61aa49bfa..11eef00b6 100644 --- a/src/net/ea/partyhandler.h +++ b/src/net/ea/partyhandler.h @@ -35,7 +35,7 @@ namespace Ea { class PartyTab; -class PartyHandler : public Net::PartyHandler +class PartyHandler notfinal : public Net::PartyHandler { public: PartyHandler(); diff --git a/src/net/ea/playerhandler.h b/src/net/ea/playerhandler.h index 087627f92..0c8afd72e 100644 --- a/src/net/ea/playerhandler.h +++ b/src/net/ea/playerhandler.h @@ -33,7 +33,7 @@ namespace Net namespace Ea { -class PlayerHandler : public Net::PlayerHandler +class PlayerHandler notfinal : public Net::PlayerHandler { public: PlayerHandler(); diff --git a/src/net/ea/skillhandler.h b/src/net/ea/skillhandler.h index 484ca6878..37ce90cbb 100644 --- a/src/net/ea/skillhandler.h +++ b/src/net/ea/skillhandler.h @@ -35,7 +35,7 @@ namespace Net namespace Ea { -class SkillHandler : public Net::SkillHandler +class SkillHandler notfinal : public Net::SkillHandler { public: SkillHandler(); diff --git a/src/net/ea/token.h b/src/net/ea/token.h index 35aadd02c..dd8a18d17 100644 --- a/src/net/ea/token.h +++ b/src/net/ea/token.h @@ -20,12 +20,12 @@ * along with this program. If not, see . */ -#include "being/being.h" +#include "being/gender.h" #ifndef NET_EA_TOKEN_H #define NET_EA_TOKEN_H -struct Token +struct Token final { int account_ID; int session_ID1; diff --git a/src/net/ea/tradehandler.h b/src/net/ea/tradehandler.h index d4c9510b8..a11941d5d 100644 --- a/src/net/ea/tradehandler.h +++ b/src/net/ea/tradehandler.h @@ -33,7 +33,7 @@ namespace Net namespace Ea { -class TradeHandler : public Net::TradeHandler +class TradeHandler notfinal : public Net::TradeHandler { public: TradeHandler(); diff --git a/src/net/eathena/gui/guildtab.h b/src/net/eathena/gui/guildtab.h index 572ea4bac..30dd63352 100644 --- a/src/net/eathena/gui/guildtab.h +++ b/src/net/eathena/gui/guildtab.h @@ -31,7 +31,7 @@ namespace EAthena /** * A tab for a guild chat channel. */ -class GuildTab : public Ea::GuildTab +class GuildTab final : public Ea::GuildTab { public: explicit GuildTab(const Widget2 *const widget); diff --git a/src/net/eathena/gui/partytab.h b/src/net/eathena/gui/partytab.h index 31dc26787..2dfd333fb 100644 --- a/src/net/eathena/gui/partytab.h +++ b/src/net/eathena/gui/partytab.h @@ -31,7 +31,7 @@ namespace EAthena /** * A tab for a party chat channel. */ -class PartyTab : public Ea::PartyTab +class PartyTab final : public Ea::PartyTab { public: explicit PartyTab(const Widget2 *const widget); diff --git a/src/net/eathena/messagehandler.h b/src/net/eathena/messagehandler.h index 1b7f9e737..5cbf7e1d9 100644 --- a/src/net/eathena/messagehandler.h +++ b/src/net/eathena/messagehandler.h @@ -35,7 +35,7 @@ class Network; /** * \ingroup Network */ -class MessageHandler : public Net::MessageHandler +class MessageHandler notfinal : public Net::MessageHandler { public: MessageHandler(); diff --git a/src/net/messagein.h b/src/net/messagein.h index 7b2b2400b..7b7df919b 100644 --- a/src/net/messagein.h +++ b/src/net/messagein.h @@ -35,7 +35,7 @@ namespace Net * * \ingroup Network */ -class MessageIn +class MessageIn notfinal { public: A_DELETE_COPY(MessageIn) diff --git a/src/net/tmwa/gui/guildtab.h b/src/net/tmwa/gui/guildtab.h index 25920c9f0..a10c592ec 100644 --- a/src/net/tmwa/gui/guildtab.h +++ b/src/net/tmwa/gui/guildtab.h @@ -31,7 +31,7 @@ namespace TmwAthena /** * A tab for a guild chat channel. */ -class GuildTab : public Ea::GuildTab +class GuildTab final : public Ea::GuildTab { public: explicit GuildTab(const Widget2 *const widget); diff --git a/src/net/tmwa/messagehandler.h b/src/net/tmwa/messagehandler.h index ae57fcba5..9f87fd6b6 100644 --- a/src/net/tmwa/messagehandler.h +++ b/src/net/tmwa/messagehandler.h @@ -35,7 +35,7 @@ class Network; /** * \ingroup Network */ -class MessageHandler : public Net::MessageHandler +class MessageHandler notfinal : public Net::MessageHandler { public: MessageHandler(); -- cgit v1.2.3-70-g09d2