19 files changed, 23 insertions, 20 deletions
diff --git a/src/net/eathena/adminhandler.h b/src/net/eathena/adminhandler.h
index 85b0da0bd..ce341e53f 100644
--- a/src/net/eathena/adminhandler.h
+++ b/src/net/eathena/adminhandler.h
@@ -33,7 +33,7 @@
 namespace EAthena
 {
 
-class AdminHandler : public MessageHandler, public Ea::AdminHandler
+class AdminHandler final : public MessageHandler, public Ea::AdminHandler
 {
     public:
         AdminHandler();
diff --git a/src/net/eathena/beinghandler.h b/src/net/eathena/beinghandler.h
index 0ddb0b348..956b3758a 100644
--- a/src/net/eathena/beinghandler.h
+++ b/src/net/eathena/beinghandler.h
@@ -33,7 +33,7 @@
 namespace EAthena
 {
 
-class BeingHandler : public MessageHandler, public Ea::BeingHandler
+class BeingHandler final : public MessageHandler, public Ea::BeingHandler
 {
     public:
         BeingHandler(bool enableSync);
diff --git a/src/net/eathena/buysellhandler.h b/src/net/eathena/buysellhandler.h
index 499ec691e..3985aa184 100644
--- a/src/net/eathena/buysellhandler.h
+++ b/src/net/eathena/buysellhandler.h
@@ -32,7 +32,7 @@
 namespace EAthena
 {
 
-class BuySellHandler : public MessageHandler, public Ea::BuySellHandler
+class BuySellHandler final : public MessageHandler, public Ea::BuySellHandler
 {
     public:
         BuySellHandler();
diff --git a/src/net/eathena/charserverhandler.h b/src/net/eathena/charserverhandler.h
index f276b6346..aa24318cf 100644
--- a/src/net/eathena/charserverhandler.h
+++ b/src/net/eathena/charserverhandler.h
@@ -39,7 +39,8 @@ namespace EAthena
 /**
  * Deals with incoming messages from the character server.
  */
-class CharServerHandler : public MessageHandler, public Ea::CharServerHandler
+class CharServerHandler final : public MessageHandler,
+                                public Ea::CharServerHandler
 {
     public:
         CharServerHandler();
diff --git a/src/net/eathena/chathandler.h b/src/net/eathena/chathandler.h
index cf999fd63..ab8f81659 100644
--- a/src/net/eathena/chathandler.h
+++ b/src/net/eathena/chathandler.h
@@ -33,7 +33,7 @@
 namespace EAthena
 {
 
-class ChatHandler : public MessageHandler, public Ea::ChatHandler
+class ChatHandler final : public MessageHandler, public Ea::ChatHandler
 {
     public:
         ChatHandler();
diff --git a/src/net/eathena/gamehandler.h b/src/net/eathena/gamehandler.h
index 97df941ee..ec0c99c91 100644
--- a/src/net/eathena/gamehandler.h
+++ b/src/net/eathena/gamehandler.h
@@ -33,7 +33,7 @@
 namespace EAthena
 {
 
-class GameHandler : public MessageHandler, public Ea::GameHandler
+class GameHandler final : public MessageHandler, public Ea::GameHandler
 {
     public:
         GameHandler();
diff --git a/src/net/eathena/generalhandler.h b/src/net/eathena/generalhandler.h
index 85c220a79..7e3a1ad9e 100644
--- a/src/net/eathena/generalhandler.h
+++ b/src/net/eathena/generalhandler.h
@@ -33,8 +33,9 @@
 namespace EAthena
 {
 
-class GeneralHandler : public MessageHandler, public Net::GeneralHandler,
-                       public Listener
+class GeneralHandler final : public MessageHandler,
+                             public Net::GeneralHandler,
+                             public Listener
 {
     public:
         GeneralHandler();
diff --git a/src/net/eathena/guildhandler.h b/src/net/eathena/guildhandler.h
index 7fd318259..fdcb88368 100644
--- a/src/net/eathena/guildhandler.h
+++ b/src/net/eathena/guildhandler.h
@@ -31,7 +31,7 @@
 namespace EAthena
 {
 
-class GuildHandler : public Ea::GuildHandler, public MessageHandler
+class GuildHandler final : public Ea::GuildHandler, public MessageHandler
 {
     public:
         GuildHandler();
diff --git a/src/net/eathena/inventoryhandler.h b/src/net/eathena/inventoryhandler.h
index c59621c4a..5a83e7b87 100644
--- a/src/net/eathena/inventoryhandler.h
+++ b/src/net/eathena/inventoryhandler.h
@@ -34,7 +34,8 @@
 namespace EAthena
 {
 
-class InventoryHandler : public MessageHandler, public Ea::InventoryHandler
+class InventoryHandler final : public MessageHandler,
+                               public Ea::InventoryHandler
 {
     public:
         InventoryHandler();
diff --git a/src/net/eathena/itemhandler.h b/src/net/eathena/itemhandler.h
index 63adb56ac..60e65d27a 100644
--- a/src/net/eathena/itemhandler.h
+++ b/src/net/eathena/itemhandler.h
@@ -30,7 +30,7 @@
 namespace EAthena
 {
 
-class ItemHandler : public MessageHandler, public Ea::ItemHandler
+class ItemHandler final : public MessageHandler, public Ea::ItemHandler
 {
     public:
         ItemHandler();
diff --git a/src/net/eathena/loginhandler.h b/src/net/eathena/loginhandler.h
index ec7713eca..26cafb5c7 100644
--- a/src/net/eathena/loginhandler.h
+++ b/src/net/eathena/loginhandler.h
@@ -36,7 +36,7 @@ class LoginData;
 namespace EAthena
 {
 
-class LoginHandler : public MessageHandler, public Ea::LoginHandler
+class LoginHandler final : public MessageHandler, public Ea::LoginHandler
 {
     public:
         LoginHandler();
diff --git a/src/net/eathena/messagein.h b/src/net/eathena/messagein.h
index a9cf0ce0f..b5f5e8baa 100644
--- a/src/net/eathena/messagein.h
+++ b/src/net/eathena/messagein.h
@@ -36,7 +36,7 @@ namespace EAthena
  *
  * \ingroup Network
  */
-    class MessageIn : public Net::MessageIn
+class MessageIn final : public Net::MessageIn
 {
     public:
         /**
diff --git a/src/net/eathena/messageout.h b/src/net/eathena/messageout.h
index c01962221..58937434c 100644
--- a/src/net/eathena/messageout.h
+++ b/src/net/eathena/messageout.h
@@ -38,7 +38,7 @@ class Network;
  *
  * \ingroup Network
  */
-class MessageOut : public Net::MessageOut
+class MessageOut final : public Net::MessageOut
 {
     public:
         /**
diff --git a/src/net/eathena/network.h b/src/net/eathena/network.h
index 3c8ab2a65..63ec5a20b 100644
--- a/src/net/eathena/network.h
+++ b/src/net/eathena/network.h
@@ -43,7 +43,7 @@
 namespace EAthena
 {
 
-class Network : public Ea::Network
+class Network final : public Ea::Network
 {
     public:
         Network();
diff --git a/src/net/eathena/npchandler.h b/src/net/eathena/npchandler.h
index f905c7fff..2417629e3 100644
--- a/src/net/eathena/npchandler.h
+++ b/src/net/eathena/npchandler.h
@@ -37,7 +37,7 @@ class NpcDialog;
 namespace EAthena
 {
 
-class NpcHandler : public MessageHandler, public Ea::NpcHandler
+class NpcHandler final : public MessageHandler, public Ea::NpcHandler
 {
     public:
         NpcHandler();
diff --git a/src/net/eathena/partyhandler.h b/src/net/eathena/partyhandler.h
index 1054f6d2d..22433c668 100644
--- a/src/net/eathena/partyhandler.h
+++ b/src/net/eathena/partyhandler.h
@@ -32,7 +32,7 @@
 namespace EAthena
 {
 
-class PartyHandler : public MessageHandler, public Ea::PartyHandler
+class PartyHandler final : public MessageHandler, public Ea::PartyHandler
 {
     public:
         PartyHandler();
diff --git a/src/net/eathena/playerhandler.h b/src/net/eathena/playerhandler.h
index c0a04a52e..0dc5d3a17 100644
--- a/src/net/eathena/playerhandler.h
+++ b/src/net/eathena/playerhandler.h
@@ -33,7 +33,7 @@
 namespace EAthena
 {
 
-class PlayerHandler : public MessageHandler, public Ea::PlayerHandler
+class PlayerHandler final : public MessageHandler, public Ea::PlayerHandler
 {
     public:
         PlayerHandler();
diff --git a/src/net/eathena/specialhandler.h b/src/net/eathena/specialhandler.h
index fe76204f2..e8603ac2e 100644
--- a/src/net/eathena/specialhandler.h
+++ b/src/net/eathena/specialhandler.h
@@ -33,7 +33,7 @@
 namespace EAthena
 {
 
-class SpecialHandler : public MessageHandler, public Ea::SpecialHandler
+class SpecialHandler final : public MessageHandler, public Ea::SpecialHandler
 {
     public:
         SpecialHandler();
diff --git a/src/net/eathena/tradehandler.h b/src/net/eathena/tradehandler.h
index ec5393340..acd282961 100644
--- a/src/net/eathena/tradehandler.h
+++ b/src/net/eathena/tradehandler.h
@@ -33,7 +33,7 @@
 namespace EAthena
 {
 
-class TradeHandler : public MessageHandler, public Ea::TradeHandler
+class TradeHandler final : public MessageHandler, public Ea::TradeHandler
 {
     public:
         TradeHandler();