summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-09-23 19:52:08 +0300
committerAndrei Karas <akaras@inbox.ru>2012-09-23 19:52:08 +0300
commit6d28f4d48f5cb3462765c7a1d582cea49352be1f (patch)
tree797671acb4cfbe9f5510e8d9769742f17d7a9b2c /src/net
parentecc0dbab411d6f1f741dd19d0bc593ecc36a4941 (diff)
downloadmanaplus-6d28f4d48f5cb3462765c7a1d582cea49352be1f.tar.gz
manaplus-6d28f4d48f5cb3462765c7a1d582cea49352be1f.tar.bz2
manaplus-6d28f4d48f5cb3462765c7a1d582cea49352be1f.tar.xz
manaplus-6d28f4d48f5cb3462765c7a1d582cea49352be1f.zip
Add missing final keywords to classes.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/download.h2
-rw-r--r--src/net/eathena/adminhandler.h2
-rw-r--r--src/net/eathena/beinghandler.h2
-rw-r--r--src/net/eathena/buysellhandler.h2
-rw-r--r--src/net/eathena/charserverhandler.h3
-rw-r--r--src/net/eathena/chathandler.h2
-rw-r--r--src/net/eathena/gamehandler.h2
-rw-r--r--src/net/eathena/generalhandler.h5
-rw-r--r--src/net/eathena/guildhandler.h2
-rw-r--r--src/net/eathena/inventoryhandler.h3
-rw-r--r--src/net/eathena/itemhandler.h2
-rw-r--r--src/net/eathena/loginhandler.h2
-rw-r--r--src/net/eathena/messagein.h2
-rw-r--r--src/net/eathena/messageout.h2
-rw-r--r--src/net/eathena/network.h2
-rw-r--r--src/net/eathena/npchandler.h2
-rw-r--r--src/net/eathena/partyhandler.h2
-rw-r--r--src/net/eathena/playerhandler.h2
-rw-r--r--src/net/eathena/specialhandler.h2
-rw-r--r--src/net/eathena/tradehandler.h2
-rw-r--r--src/net/logindata.h2
-rw-r--r--src/net/packetcounters.h2
-rw-r--r--src/net/serverinfo.h2
-rw-r--r--src/net/tmwa/adminhandler.h2
-rw-r--r--src/net/tmwa/beinghandler.h2
-rw-r--r--src/net/tmwa/buysellhandler.h2
-rw-r--r--src/net/tmwa/charserverhandler.h3
-rw-r--r--src/net/tmwa/chathandler.h2
-rw-r--r--src/net/tmwa/gamehandler.h2
-rw-r--r--src/net/tmwa/generalhandler.h4
-rw-r--r--src/net/tmwa/guildhandler.h2
-rw-r--r--src/net/tmwa/inventoryhandler.h3
-rw-r--r--src/net/tmwa/itemhandler.h2
-rw-r--r--src/net/tmwa/loginhandler.h2
-rw-r--r--src/net/tmwa/messagein.h2
-rw-r--r--src/net/tmwa/messageout.h2
-rw-r--r--src/net/tmwa/network.h2
-rw-r--r--src/net/tmwa/npchandler.h2
-rw-r--r--src/net/tmwa/partyhandler.h2
-rw-r--r--src/net/tmwa/playerhandler.h2
-rw-r--r--src/net/tmwa/questhandler.h2
-rw-r--r--src/net/tmwa/specialhandler.h2
-rw-r--r--src/net/tmwa/tradehandler.h2
-rw-r--r--src/net/worldinfo.h2
44 files changed, 51 insertions, 46 deletions
diff --git a/src/net/download.h b/src/net/download.h
index 021daae32..ec55e60ae 100644
--- a/src/net/download.h
+++ b/src/net/download.h
@@ -51,7 +51,7 @@ struct curl_slist;
namespace Net
{
-class Download
+class Download final
{
public:
Download(void *ptr, const std::string &url,
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();
diff --git a/src/net/logindata.h b/src/net/logindata.h
index dda58e10f..8988c5890 100644
--- a/src/net/logindata.h
+++ b/src/net/logindata.h
@@ -27,7 +27,7 @@
#include <string>
-class LoginData
+class LoginData final
{
public:
LoginData():
diff --git a/src/net/packetcounters.h b/src/net/packetcounters.h
index 936217c95..86277d5d7 100644
--- a/src/net/packetcounters.h
+++ b/src/net/packetcounters.h
@@ -23,7 +23,7 @@
#ifndef PACKETCOUNTERS_H
#define PACKETCOUNTERS_H
-class PacketCounters
+class PacketCounters final
{
public:
static void incInBytes(int cnt);
diff --git a/src/net/serverinfo.h b/src/net/serverinfo.h
index b4665946c..7be5957d2 100644
--- a/src/net/serverinfo.h
+++ b/src/net/serverinfo.h
@@ -30,7 +30,7 @@
#include "localconsts.h"
-class ServerInfo
+class ServerInfo final
{
public:
enum Type
diff --git a/src/net/tmwa/adminhandler.h b/src/net/tmwa/adminhandler.h
index 4063a7fba..6bb1b9fd0 100644
--- a/src/net/tmwa/adminhandler.h
+++ b/src/net/tmwa/adminhandler.h
@@ -33,7 +33,7 @@
namespace TmwAthena
{
-class AdminHandler : public MessageHandler, public Ea::AdminHandler
+class AdminHandler final : public MessageHandler, public Ea::AdminHandler
{
public:
AdminHandler();
diff --git a/src/net/tmwa/beinghandler.h b/src/net/tmwa/beinghandler.h
index a45e33d36..a5732166c 100644
--- a/src/net/tmwa/beinghandler.h
+++ b/src/net/tmwa/beinghandler.h
@@ -33,7 +33,7 @@
namespace TmwAthena
{
-class BeingHandler : public MessageHandler, public Ea::BeingHandler
+class BeingHandler final : public MessageHandler, public Ea::BeingHandler
{
public:
BeingHandler(bool enableSync);
diff --git a/src/net/tmwa/buysellhandler.h b/src/net/tmwa/buysellhandler.h
index 69188099f..4c9736cf2 100644
--- a/src/net/tmwa/buysellhandler.h
+++ b/src/net/tmwa/buysellhandler.h
@@ -32,7 +32,7 @@
namespace TmwAthena
{
-class BuySellHandler : public MessageHandler, public Ea::BuySellHandler
+class BuySellHandler final : public MessageHandler, public Ea::BuySellHandler
{
public:
BuySellHandler();
diff --git a/src/net/tmwa/charserverhandler.h b/src/net/tmwa/charserverhandler.h
index 7a6629237..f85d128b6 100644
--- a/src/net/tmwa/charserverhandler.h
+++ b/src/net/tmwa/charserverhandler.h
@@ -39,7 +39,8 @@ namespace TmwAthena
/**
* 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/tmwa/chathandler.h b/src/net/tmwa/chathandler.h
index 8652d297d..4d46bbeac 100644
--- a/src/net/tmwa/chathandler.h
+++ b/src/net/tmwa/chathandler.h
@@ -33,7 +33,7 @@
namespace TmwAthena
{
-class ChatHandler : public MessageHandler, public Ea::ChatHandler
+class ChatHandler final : public MessageHandler, public Ea::ChatHandler
{
public:
ChatHandler();
diff --git a/src/net/tmwa/gamehandler.h b/src/net/tmwa/gamehandler.h
index 8f399d230..9dac38d19 100644
--- a/src/net/tmwa/gamehandler.h
+++ b/src/net/tmwa/gamehandler.h
@@ -33,7 +33,7 @@
namespace TmwAthena
{
-class GameHandler : public MessageHandler, public Ea::GameHandler
+class GameHandler final : public MessageHandler, public Ea::GameHandler
{
public:
GameHandler();
diff --git a/src/net/tmwa/generalhandler.h b/src/net/tmwa/generalhandler.h
index a296d6ad5..1438ce4db 100644
--- a/src/net/tmwa/generalhandler.h
+++ b/src/net/tmwa/generalhandler.h
@@ -33,8 +33,8 @@
namespace TmwAthena
{
-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/tmwa/guildhandler.h b/src/net/tmwa/guildhandler.h
index a2e6a88e3..bea2b2c3b 100644
--- a/src/net/tmwa/guildhandler.h
+++ b/src/net/tmwa/guildhandler.h
@@ -31,7 +31,7 @@
namespace TmwAthena
{
-class GuildHandler : public Ea::GuildHandler, public MessageHandler
+class GuildHandler final : public Ea::GuildHandler, public MessageHandler
{
public:
GuildHandler();
diff --git a/src/net/tmwa/inventoryhandler.h b/src/net/tmwa/inventoryhandler.h
index c6e000b3a..7e3fabf42 100644
--- a/src/net/tmwa/inventoryhandler.h
+++ b/src/net/tmwa/inventoryhandler.h
@@ -34,7 +34,8 @@
namespace TmwAthena
{
-class InventoryHandler : public MessageHandler, public Ea::InventoryHandler
+class InventoryHandler final : public MessageHandler,
+ public Ea::InventoryHandler
{
public:
InventoryHandler();
diff --git a/src/net/tmwa/itemhandler.h b/src/net/tmwa/itemhandler.h
index 0f2459fbf..02fbba796 100644
--- a/src/net/tmwa/itemhandler.h
+++ b/src/net/tmwa/itemhandler.h
@@ -30,7 +30,7 @@
namespace TmwAthena
{
-class ItemHandler : public MessageHandler, public Ea::ItemHandler
+class ItemHandler final : public MessageHandler, public Ea::ItemHandler
{
public:
ItemHandler();
diff --git a/src/net/tmwa/loginhandler.h b/src/net/tmwa/loginhandler.h
index ecd9d2428..108b5fbd3 100644
--- a/src/net/tmwa/loginhandler.h
+++ b/src/net/tmwa/loginhandler.h
@@ -36,7 +36,7 @@ class LoginData;
namespace TmwAthena
{
-class LoginHandler : public MessageHandler, public Ea::LoginHandler
+class LoginHandler final : public MessageHandler, public Ea::LoginHandler
{
public:
LoginHandler();
diff --git a/src/net/tmwa/messagein.h b/src/net/tmwa/messagein.h
index c8dfb5bff..35804b34e 100644
--- a/src/net/tmwa/messagein.h
+++ b/src/net/tmwa/messagein.h
@@ -36,7 +36,7 @@ namespace TmwAthena
*
* \ingroup Network
*/
- class MessageIn : public Net::MessageIn
+class MessageIn final : public Net::MessageIn
{
public:
/**
diff --git a/src/net/tmwa/messageout.h b/src/net/tmwa/messageout.h
index d283de4ca..17c1cb5e5 100644
--- a/src/net/tmwa/messageout.h
+++ b/src/net/tmwa/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/tmwa/network.h b/src/net/tmwa/network.h
index 57fa339e1..4db67e92c 100644
--- a/src/net/tmwa/network.h
+++ b/src/net/tmwa/network.h
@@ -44,7 +44,7 @@
namespace TmwAthena
{
-class Network : public Ea::Network
+class Network final : public Ea::Network
{
public:
Network();
diff --git a/src/net/tmwa/npchandler.h b/src/net/tmwa/npchandler.h
index 1cfcacb20..a10c455f3 100644
--- a/src/net/tmwa/npchandler.h
+++ b/src/net/tmwa/npchandler.h
@@ -37,7 +37,7 @@ class NpcDialog;
namespace TmwAthena
{
-class NpcHandler : public MessageHandler, public Ea::NpcHandler
+class NpcHandler final : public MessageHandler, public Ea::NpcHandler
{
public:
NpcHandler();
diff --git a/src/net/tmwa/partyhandler.h b/src/net/tmwa/partyhandler.h
index c4d20b353..61b873d5d 100644
--- a/src/net/tmwa/partyhandler.h
+++ b/src/net/tmwa/partyhandler.h
@@ -32,7 +32,7 @@
namespace TmwAthena
{
-class PartyHandler : public MessageHandler, public Ea::PartyHandler
+class PartyHandler final : public MessageHandler, public Ea::PartyHandler
{
public:
PartyHandler();
diff --git a/src/net/tmwa/playerhandler.h b/src/net/tmwa/playerhandler.h
index e7e99375f..6633eb506 100644
--- a/src/net/tmwa/playerhandler.h
+++ b/src/net/tmwa/playerhandler.h
@@ -33,7 +33,7 @@
namespace TmwAthena
{
-class PlayerHandler : public MessageHandler, public Ea::PlayerHandler
+class PlayerHandler final : public MessageHandler, public Ea::PlayerHandler
{
public:
PlayerHandler();
diff --git a/src/net/tmwa/questhandler.h b/src/net/tmwa/questhandler.h
index aa2534ddb..a2f7ad9a7 100644
--- a/src/net/tmwa/questhandler.h
+++ b/src/net/tmwa/questhandler.h
@@ -33,7 +33,7 @@
namespace TmwAthena
{
-class QuestHandler : public MessageHandler
+class QuestHandler final : public MessageHandler
{
public:
QuestHandler();
diff --git a/src/net/tmwa/specialhandler.h b/src/net/tmwa/specialhandler.h
index 216adddc6..3fbca307c 100644
--- a/src/net/tmwa/specialhandler.h
+++ b/src/net/tmwa/specialhandler.h
@@ -33,7 +33,7 @@
namespace TmwAthena
{
-class SpecialHandler : public MessageHandler, public Ea::SpecialHandler
+class SpecialHandler final : public MessageHandler, public Ea::SpecialHandler
{
public:
SpecialHandler();
diff --git a/src/net/tmwa/tradehandler.h b/src/net/tmwa/tradehandler.h
index b5a06ef6a..8ac152e71 100644
--- a/src/net/tmwa/tradehandler.h
+++ b/src/net/tmwa/tradehandler.h
@@ -33,7 +33,7 @@
namespace TmwAthena
{
-class TradeHandler : public MessageHandler, public Ea::TradeHandler
+class TradeHandler final : public MessageHandler, public Ea::TradeHandler
{
public:
TradeHandler();
diff --git a/src/net/worldinfo.h b/src/net/worldinfo.h
index 26733a0da..3b562e6ec 100644
--- a/src/net/worldinfo.h
+++ b/src/net/worldinfo.h
@@ -26,7 +26,7 @@
#include <string>
#include <vector>
-struct WorldInfo
+struct WorldInfo final
{
int address;
std::string name;