another fixes from cpplint.

65 files changed, 92 insertions, 96 deletions

diff --git a/src/net/chathandler.h b/src/net/chathandler.h
index fe113b6d5..dd60fbbe6 100644
--- a/src/net/chathandler.h
+++ b/src/net/chathandler.h
@@ -54,6 +54,6 @@ class ChatHandler
         virtual void unIgnoreAll() const = 0;
 };
 
-}
+}  // namespace Net
 
 #endif  // CHATHANDLER_H
diff --git a/src/net/ea/adminhandler.h b/src/net/ea/adminhandler.h
index 06dc7ab8c..7112bb75d 100644
--- a/src/net/ea/adminhandler.h
+++ b/src/net/ea/adminhandler.h
@@ -59,4 +59,4 @@ class AdminHandler : public Net::AdminHandler
 
 }  // namespace Ea
 
-#endif // NET_EA_ADMINHANDLER_H
+#endif  // NET_EA_ADMINHANDLER_H
diff --git a/src/net/ea/beinghandler.h b/src/net/ea/beinghandler.h
index 46a28b908..6552e5a69 100644
--- a/src/net/ea/beinghandler.h
+++ b/src/net/ea/beinghandler.h
@@ -32,7 +32,7 @@ namespace Ea
 class BeingHandler : public Net::BeingHandler
 {
     public:
-        BeingHandler(const bool enableSync);
+        explicit BeingHandler(const bool enableSync);
 
         A_DELETE_COPY(BeingHandler)
 
@@ -104,4 +104,4 @@ class BeingHandler : public Net::BeingHandler
 
 }  // namespace Ea
 
-#endif // NET_EA_BEINGHANDLER_H
+#endif  // NET_EA_BEINGHANDLER_H
diff --git a/src/net/ea/buysellhandler.h b/src/net/ea/buysellhandler.h
index fb7db09e0..8cb4b2951 100644
--- a/src/net/ea/buysellhandler.h
+++ b/src/net/ea/buysellhandler.h
@@ -67,4 +67,4 @@ class BuySellHandler : public Net::BuySellHandler
 
 }  // namespace Ea
 
-#endif // NET_EA_BUYSELLHANDLER_H
+#endif  // NET_EA_BUYSELLHANDLER_H
diff --git a/src/net/ea/charserverhandler.h b/src/net/ea/charserverhandler.h
index be91ef017..aeb8d2d09 100644
--- a/src/net/ea/charserverhandler.h
+++ b/src/net/ea/charserverhandler.h
@@ -94,4 +94,4 @@ class CharServerHandler : public Net::CharServerHandler
 
 }  // namespace Ea
 
-#endif // NET_EA_CHARSERVERHANDLER_H
+#endif  // NET_EA_CHARSERVERHANDLER_H
diff --git a/src/net/ea/chathandler.h b/src/net/ea/chathandler.h
index fb286a845..327a708cd 100644
--- a/src/net/ea/chathandler.h
+++ b/src/net/ea/chathandler.h
@@ -65,4 +65,4 @@ class ChatHandler : public Net::ChatHandler
 
 }  // namespace Ea
 
-#endif // NET_EA_CHATHANDLER_H
+#endif  // NET_EA_CHATHANDLER_H
diff --git a/src/net/ea/gamehandler.h b/src/net/ea/gamehandler.h
index 98b108a0d..5fe74af68 100644
--- a/src/net/ea/gamehandler.h
+++ b/src/net/ea/gamehandler.h
@@ -61,9 +61,9 @@ class GameHandler : public Net::GameHandler
 
     protected:
         std::string mMap;
-        int mCharID; /// < Saved for map-server switching
+        int mCharID;  // < Saved for map-server switching
 };
 
 }  // namespace Ea
 
-#endif // NET_EA_GAMEHANDLER_H
+#endif  // NET_EA_GAMEHANDLER_H
diff --git a/src/net/ea/gui/guildtab.h b/src/net/ea/gui/guildtab.h
index 6558cbef1..fdfd2fea4 100644
--- a/src/net/ea/gui/guildtab.h
+++ b/src/net/ea/gui/guildtab.h
@@ -34,7 +34,7 @@ namespace Ea
 class GuildTab : public ChatTab, public ConfigListener
 {
     public:
-        GuildTab(const Widget2 *const widget);
+        explicit GuildTab(const Widget2 *const widget);
 
         A_DELETE_COPY(GuildTab)
 
diff --git a/src/net/ea/gui/partytab.h b/src/net/ea/gui/partytab.h
index e1fd7e4c3..a2c782248 100644
--- a/src/net/ea/gui/partytab.h
+++ b/src/net/ea/gui/partytab.h
@@ -34,7 +34,7 @@ namespace Ea
 class PartyTab : public ChatTab
 {
     public:
-        PartyTab(const Widget2 *const widget);
+        explicit PartyTab(const Widget2 *const widget);
 
         A_DELETE_COPY(PartyTab)
 
diff --git a/src/net/ea/guildhandler.h b/src/net/ea/guildhandler.h
index a1a66763c..717641956 100644
--- a/src/net/ea/guildhandler.h
+++ b/src/net/ea/guildhandler.h
@@ -110,6 +110,6 @@ class GuildHandler : public Net::GuildHandler
 
 extern Guild *taGuild;
 extern GuildTab *guildTab;
-}
+}  // namespace Ea
 
-#endif // NET_EA_GUILDHANDLER_H
+#endif  // NET_EA_GUILDHANDLER_H
diff --git a/src/net/ea/inventoryhandler.h b/src/net/ea/inventoryhandler.h
index 415acd2e5..b398053e3 100644
--- a/src/net/ea/inventoryhandler.h
+++ b/src/net/ea/inventoryhandler.h
@@ -212,4 +212,4 @@ class InventoryHandler : public Net::InventoryHandler
 
 }  // namespace Ea
 
-#endif // NET_EA_INVENTORYHANDLER_H
+#endif  // NET_EA_INVENTORYHANDLER_H
diff --git a/src/net/ea/itemhandler.h b/src/net/ea/itemhandler.h
index 5aa1ee51a..cd56f2d12 100644
--- a/src/net/ea/itemhandler.h
+++ b/src/net/ea/itemhandler.h
@@ -45,4 +45,4 @@ class ItemHandler
 
 }  // namespace Ea
 
-#endif // NET_EA_ITEMHANDLER_H
+#endif  // NET_EA_ITEMHANDLER_H
diff --git a/src/net/ea/loginhandler.h b/src/net/ea/loginhandler.h
index 0c290f583..38defc09d 100644
--- a/src/net/ea/loginhandler.h
+++ b/src/net/ea/loginhandler.h
@@ -106,4 +106,4 @@ class LoginHandler : public Net::LoginHandler
 
 }  // namespace Ea
 
-#endif // NET_TA_LOGINHANDLER_H
+#endif  // NET_TA_LOGINHANDLER_H
diff --git a/src/net/ea/network.h b/src/net/ea/network.h
index 823fa2714..e0066afaf 100644
--- a/src/net/ea/network.h
+++ b/src/net/ea/network.h
@@ -114,4 +114,4 @@ class Network
 
 }  // namespace Ea
 
-#endif // NET_EA_NETWORK_H
+#endif  // NET_EA_NETWORK_H
diff --git a/src/net/ea/npchandler.h b/src/net/ea/npchandler.h
index 6bc88aac7..c87cb0ce3 100644
--- a/src/net/ea/npchandler.h
+++ b/src/net/ea/npchandler.h
@@ -77,4 +77,4 @@ class NpcHandler : public Net::NpcHandler
 
 }  // namespace Ea
 
-#endif // NET_EA_NPCHANDLER_H
+#endif  // NET_EA_NPCHANDLER_H
diff --git a/src/net/ea/partyhandler.h b/src/net/ea/partyhandler.h
index 9a9867916..5b42f557f 100644
--- a/src/net/ea/partyhandler.h
+++ b/src/net/ea/partyhandler.h
@@ -86,4 +86,4 @@ extern Party *taParty;
 
 }  // namespace Ea
 
-#endif // NET_EA_PARTYHANDLER_H
+#endif  // NET_EA_PARTYHANDLER_H
diff --git a/src/net/ea/playerhandler.h b/src/net/ea/playerhandler.h
index 02241df97..e5135ea3d 100644
--- a/src/net/ea/playerhandler.h
+++ b/src/net/ea/playerhandler.h
@@ -75,4 +75,4 @@ class PlayerHandler : public Net::PlayerHandler
 
 }  // namespace Ea
 
-#endif // NET_EA_PLAYERHANDLER_H
+#endif  // NET_EA_PLAYERHANDLER_H
diff --git a/src/net/ea/skillhandler.h b/src/net/ea/skillhandler.h
index 8a5cb93cc..155f81ba7 100644
--- a/src/net/ea/skillhandler.h
+++ b/src/net/ea/skillhandler.h
@@ -46,4 +46,4 @@ class SkillHandler : public Net::SkillHandler
 
 }  // namespace Ea
 
-#endif // NET_EA_SKILLHANDLER_H
+#endif  // NET_EA_SKILLHANDLER_H
diff --git a/src/net/ea/token.h b/src/net/ea/token.h
index 199bb9f8a..c358ef8a7 100644
--- a/src/net/ea/token.h
+++ b/src/net/ea/token.h
@@ -41,4 +41,4 @@ struct Token
     }
 };
 
-#endif // NET_EA_TOKEN_H
+#endif  // NET_EA_TOKEN_H
diff --git a/src/net/ea/tradehandler.h b/src/net/ea/tradehandler.h
index c01f36fd8..9abc7e84b 100644
--- a/src/net/ea/tradehandler.h
+++ b/src/net/ea/tradehandler.h
@@ -56,4 +56,4 @@ class TradeHandler : public Net::TradeHandler
 
 }  // namespace Ea
 
-#endif // NET_EA_TRADEHANDLER_H
+#endif  // NET_EA_TRADEHANDLER_H
diff --git a/src/net/eathena/adminhandler.h b/src/net/eathena/adminhandler.h
index 9b8490f50..5e8250250 100644
--- a/src/net/eathena/adminhandler.h
+++ b/src/net/eathena/adminhandler.h
@@ -53,4 +53,4 @@ class AdminHandler final : public MessageHandler, public Ea::AdminHandler
 
 }  // namespace EAthena
 
-#endif // NET_EATHENA_ADMINHANDLER_H
+#endif  // NET_EATHENA_ADMINHANDLER_H
diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp
index f3680f3c9..76f2cd7cc 100644
--- a/src/net/eathena/beinghandler.cpp
+++ b/src/net/eathena/beinghandler.cpp
@@ -57,7 +57,7 @@ extern Net::BeingHandler *beingHandler;
 namespace EAthena
 {
 
-BeingHandler::BeingHandler(bool enableSync):
+BeingHandler::BeingHandler(const bool enableSync):
     MessageHandler(),
     Ea::BeingHandler(enableSync)
 {
diff --git a/src/net/eathena/beinghandler.h b/src/net/eathena/beinghandler.h
index cc65c3ea8..50ffb1809 100644
--- a/src/net/eathena/beinghandler.h
+++ b/src/net/eathena/beinghandler.h
@@ -36,7 +36,7 @@ namespace EAthena
 class BeingHandler final : public MessageHandler, public Ea::BeingHandler
 {
     public:
-        BeingHandler(bool enableSync);
+        explicit BeingHandler(const bool enableSync);
 
         A_DELETE_COPY(BeingHandler)
 
diff --git a/src/net/eathena/chathandler.h b/src/net/eathena/chathandler.h
index 1d31b3c16..e918fecc5 100644
--- a/src/net/eathena/chathandler.h
+++ b/src/net/eathena/chathandler.h
@@ -63,4 +63,4 @@ class ChatHandler final : public MessageHandler, public Ea::ChatHandler
 
 }  // namespace EAthena
 
-#endif // NET_EATHENA_CHATHANDLER_H
+#endif  // NET_EATHENA_CHATHANDLER_H
diff --git a/src/net/eathena/gui/guildtab.h b/src/net/eathena/gui/guildtab.h
index eb4ac077e..50d96427a 100644
--- a/src/net/eathena/gui/guildtab.h
+++ b/src/net/eathena/gui/guildtab.h
@@ -34,7 +34,7 @@ namespace EAthena
 class GuildTab : public Ea::GuildTab
 {
     public:
-        GuildTab(const Widget2 *const widget);
+        explicit GuildTab(const Widget2 *const widget);
 
         A_DELETE_COPY(GuildTab)
 
diff --git a/src/net/eathena/gui/partytab.h b/src/net/eathena/gui/partytab.h
index 1e9bbc920..00828891e 100644
--- a/src/net/eathena/gui/partytab.h
+++ b/src/net/eathena/gui/partytab.h
@@ -34,7 +34,7 @@ namespace EAthena
 class PartyTab : public Ea::PartyTab
 {
     public:
-        PartyTab(const Widget2 *const widget);
+        explicit PartyTab(const Widget2 *const widget);
 
         A_DELETE_COPY(PartyTab)
 
diff --git a/src/net/eathena/guildhandler.h b/src/net/eathena/guildhandler.h
index 26c57411a..ad6a12aee 100644
--- a/src/net/eathena/guildhandler.h
+++ b/src/net/eathena/guildhandler.h
@@ -74,4 +74,4 @@ class GuildHandler final : public Ea::GuildHandler, public MessageHandler
     extern Guild *taGuild;
 }
 
-#endif // NET_EATHENA_GUILDHANDLER_H
+#endif  // namespace EAthena
diff --git a/src/net/eathena/inventoryhandler.h b/src/net/eathena/inventoryhandler.h
index 25fc25b17..d33771fb1 100644
--- a/src/net/eathena/inventoryhandler.h
+++ b/src/net/eathena/inventoryhandler.h
@@ -62,4 +62,4 @@ class InventoryHandler final : public MessageHandler,
 
 }  // namespace EAthena
 
-#endif // NET_EATHENA_INVENTORYHANDLER_H
+#endif  // NET_EATHENA_INVENTORYHANDLER_H
diff --git a/src/net/eathena/messagehandler.h b/src/net/eathena/messagehandler.h
index 3572b2152..0139f0ee2 100644
--- a/src/net/eathena/messagehandler.h
+++ b/src/net/eathena/messagehandler.h
@@ -58,4 +58,4 @@ typedef const std::auto_ptr<MessageHandler> MessageHandlerPtr;
 
 }
 
-#endif // NET_EATHENA_MESSAGEHANDLER_H
+#endif  // namespace EAthena
diff --git a/src/net/eathena/messagein.h b/src/net/eathena/messagein.h
index 7279d8dcf..59faa7750 100644
--- a/src/net/eathena/messagein.h
+++ b/src/net/eathena/messagein.h
@@ -54,4 +54,4 @@ class MessageIn final : public Net::MessageIn
 
 }
 
-#endif // NET_EATHENA_MESSAGEIN_H
+#endif  // namespace EAthena
diff --git a/src/net/eathena/messageout.h b/src/net/eathena/messageout.h
index 05c82b6f5..ad1a9bfde 100644
--- a/src/net/eathena/messageout.h
+++ b/src/net/eathena/messageout.h
@@ -46,7 +46,7 @@ class MessageOut final : public Net::MessageOut
         /**
          * Constructor.
          */
-        MessageOut(const short id);
+        explicit MessageOut(const short id);
 
         A_DELETE_COPY(MessageOut)
 
@@ -72,4 +72,4 @@ class MessageOut final : public Net::MessageOut
 
 }
 
-#endif // NET_EATHENA_MESSAGEOUT_H
+#endif  // namespace EAthena
diff --git a/src/net/eathena/partyhandler.h b/src/net/eathena/partyhandler.h
index ec79c2c57..3a75fefd3 100644
--- a/src/net/eathena/partyhandler.h
+++ b/src/net/eathena/partyhandler.h
@@ -67,4 +67,4 @@ class PartyHandler final : public MessageHandler, public Ea::PartyHandler
 
 }  // namespace EAthena
 
-#endif // NET_EATHENA_PARTYHANDLER_H
+#endif  // NET_EATHENA_PARTYHANDLER_H
diff --git a/src/net/eathena/protocol.h b/src/net/eathena/protocol.h
index 77803de28..8ac5dd011 100644
--- a/src/net/eathena/protocol.h
+++ b/src/net/eathena/protocol.h
@@ -47,7 +47,7 @@ namespace EAthena
 //        KARMA,
 //        MANNER
     };
-}
+}  // namespace EAthena
 
 enum
 {
@@ -89,8 +89,8 @@ enum
 #define SMSG_CHAR_DELETE_SUCCEEDED   0x006f
 #define SMSG_CHAR_DELETE_FAILED      0x0070
 #define SMSG_CHAR_MAP_INFO           0x0071
-#define SMSG_CHAR_PASSWORD_RESPONSE  0x0062 /**< Custom packet reply \
-                                              to password change request */
+// Custom packet reply to password change request
+#define SMSG_CHAR_PASSWORD_RESPONSE  0x0062
 
 #define SMSG_CHAR_SWITCH_RESPONSE    0x00b3
 #define SMSG_CHANGE_MAP_SERVER       0x0092
@@ -134,8 +134,8 @@ enum
 #define SMSG_BEING_MOVE2             0x0086 /**< New eAthena being moves */
 #define SMSG_BEING_REMOVE            0x0080
 #define SMSG_BEING_CHANGE_LOOKS      0x00c3
-#define SMSG_BEING_CHANGE_LOOKS2     0x01d7 /**< Same as 0x00c3, \
-                                                 but 16 bit ID */
+// Same as 0x00c3, but 16 bit ID
+#define SMSG_BEING_CHANGE_LOOKS2     0x01d7
 #define SMSG_BEING_SELFEFFECT        0x019b
 #define SMSG_BEING_EMOTION           0x00c0
 #define SMSG_BEING_ACTION            0x008a /**< Attack, sit, stand up, ... */
@@ -166,8 +166,8 @@ enum
 #define SMSG_GM_CHAT                 0x009a /**< GM announce */
 #define SMSG_WALK_RESPONSE           0x0087
 
-#define SMSG_TRADE_REQUEST           0x00e5 /**< Receiving a request \
-                                                 to trade */
+// Receiving a request to trade
+#define SMSG_TRADE_REQUEST           0x00e5
 #define SMSG_TRADE_RESPONSE          0x00e7
 #define SMSG_TRADE_ITEM_ADD          0x00e9
 #define SMSG_TRADE_ITEM_ADD_RESPONSE 0x01b1 /**< Not standard eAthena! */
@@ -190,8 +190,8 @@ enum
 #define SMSG_PLAYER_STORAGE_EQUIP    0x00a6 /**< Equipment list for storage */
 #define SMSG_PLAYER_STORAGE_STATUS   0x00f2 /**< Slots used and total slots */
 #define SMSG_PLAYER_STORAGE_ADD      0x00f4 /**< Add item/equip to storage */
-#define SMSG_PLAYER_STORAGE_REMOVE   0x00f6 /**< Remove item/equip \
-                                                 from storage */
+// Remove item/equip from storage
+#define SMSG_PLAYER_STORAGE_REMOVE   0x00f6
 #define SMSG_PLAYER_STORAGE_CLOSE    0x00f8 /**< Storage access closed */
 
 #define SMSG_ADMIN_KICK_ACK          0x00cd
@@ -230,8 +230,8 @@ enum
  **********************************/
 #define CMSG_SERVER_VERSION_REQUEST  0x7530
 
-#define CMSG_CHAR_PASSWORD_CHANGE    0x0061 /**< Custom change \
-                                                 password packet */
+// Custom change password packet
+#define CMSG_CHAR_PASSWORD_CHANGE    0x0061
 #define CMSG_CHAR_SERVER_CONNECT     0x0065
 #define CMSG_CHAR_SELECT             0x0066
 #define CMSG_CHAR_CREATE             0x0067
diff --git a/src/net/eathena/tradehandler.h b/src/net/eathena/tradehandler.h
index 89284f5cd..22a8401c9 100644
--- a/src/net/eathena/tradehandler.h
+++ b/src/net/eathena/tradehandler.h
@@ -59,4 +59,4 @@ class TradeHandler final : public MessageHandler, public Ea::TradeHandler
 
 }  // namespace EAthena
 
-#endif // NET_EATHENA_TRADEHANDLER_H
+#endif  // NET_EATHENA_TRADEHANDLER_H
diff --git a/src/net/inventoryhandler.h b/src/net/inventoryhandler.h
index 48e6e7afe..d751676e6 100644
--- a/src/net/inventoryhandler.h
+++ b/src/net/inventoryhandler.h
@@ -57,13 +57,10 @@ class InventoryHandler
 
         virtual void closeStorage(const int type) const = 0;
 
-        //void changeCart() = 0;
-
         virtual void moveItem2(const int source, const int slot,
                                const int amount,
                                const int destination) const = 0;
 
-        // TODO: fix/remove me
         virtual size_t getSize(const int type) const A_WARN_UNUSED = 0;
 
         virtual int convertFromServerSlot(const int eAthenaSlot) const = 0;
diff --git a/src/net/logindata.h b/src/net/logindata.h
index a88879310..a36150fa3 100644
--- a/src/net/logindata.h
+++ b/src/net/logindata.h
@@ -70,11 +70,10 @@ class LoginData final
 
         Gender gender;
 
-        bool remember;            /**< Whether to store the username. */
-        bool registerLogin;       /**< Whether an account
-                                       is being registered. */
+        bool remember;       // Whether to store the username.
+        bool registerLogin;  // Whether an account is being registered.
 
-        unsigned short characterSlots; /**< The number of character slots */
+        unsigned short characterSlots;  // The number of character slots
 
         void clear()
         {
diff --git a/src/net/loginhandler.h b/src/net/loginhandler.h
index e72c9f761..224724e6b 100644
--- a/src/net/loginhandler.h
+++ b/src/net/loginhandler.h
@@ -103,7 +103,7 @@ class LoginHandler
 
         virtual void clearWorlds() = 0;
 
-        virtual ~LoginHandler ()
+        virtual ~LoginHandler()
         { }
 
     protected:
diff --git a/src/net/messageout.h b/src/net/messageout.h
index b69a91b75..4b8ef5fe3 100644
--- a/src/net/messageout.h
+++ b/src/net/messageout.h
@@ -79,7 +79,7 @@ class MessageOut
         /**
          * Constructor.
          */
-        MessageOut(short id);
+        explicit MessageOut(short id);
 
         /**
          * Expand the packet data to be able to hold more data.
diff --git a/src/net/packetcounters.h b/src/net/packetcounters.h
index bc3d1de37..95a13ee06 100644
--- a/src/net/packetcounters.h
+++ b/src/net/packetcounters.h
@@ -59,7 +59,6 @@ public:
 
 private:
     static void updateCounter(int &currentSec, int &calc, int &counter);
-
 };
 
 #endif
diff --git a/src/net/skillhandler.h b/src/net/skillhandler.h
index 97f7415b7..1ecefad15 100644
--- a/src/net/skillhandler.h
+++ b/src/net/skillhandler.h
@@ -30,7 +30,7 @@ namespace Net
 class SkillHandler
 {
     public:
-        virtual ~SkillHandler ()
+        virtual ~SkillHandler()
         { }
 
         virtual void useBeing(const int id, const int level,
diff --git a/src/net/tmwa/adminhandler.h b/src/net/tmwa/adminhandler.h
index 621bf6466..d3bb2ed0e 100644
--- a/src/net/tmwa/adminhandler.h
+++ b/src/net/tmwa/adminhandler.h
@@ -53,4 +53,4 @@ class AdminHandler final : public MessageHandler, public Ea::AdminHandler
 
 }  // namespace TmwAthena
 
-#endif // NET_TA_ADMINHANDLER_H
+#endif  // NET_TA_ADMINHANDLER_H
diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp
index 07cef46fd..d70dfb16d 100644
--- a/src/net/tmwa/beinghandler.cpp
+++ b/src/net/tmwa/beinghandler.cpp
@@ -57,7 +57,7 @@ extern Net::BeingHandler *beingHandler;
 namespace TmwAthena
 {
 
-BeingHandler::BeingHandler(bool enableSync) :
+BeingHandler::BeingHandler(const bool enableSync) :
     MessageHandler(),
     Ea::BeingHandler(enableSync)
 {
diff --git a/src/net/tmwa/beinghandler.h b/src/net/tmwa/beinghandler.h
index 2aafcc699..6cb6b447e 100644
--- a/src/net/tmwa/beinghandler.h
+++ b/src/net/tmwa/beinghandler.h
@@ -36,7 +36,7 @@ namespace TmwAthena
 class BeingHandler final : public MessageHandler, public Ea::BeingHandler
 {
     public:
-        BeingHandler(bool enableSync);
+        explicit BeingHandler(const bool enableSync);
 
         A_DELETE_COPY(BeingHandler)
 
@@ -58,4 +58,4 @@ class BeingHandler final : public MessageHandler, public Ea::BeingHandler
 
 }  // namespace TmwAthena
 
-#endif // NET_TA_BEINGHANDLER_H
+#endif  // NET_TA_BEINGHANDLER_H
diff --git a/src/net/tmwa/buysellhandler.h b/src/net/tmwa/buysellhandler.h
index a74272816..f3f36e5b3 100644
--- a/src/net/tmwa/buysellhandler.h
+++ b/src/net/tmwa/buysellhandler.h
@@ -48,4 +48,4 @@ class BuySellHandler final : public MessageHandler, public Ea::BuySellHandler
 
 }  // namespace TmwAthena
 
-#endif // NET_TA_BUYSELLHANDLER_H
+#endif  // NET_TA_BUYSELLHANDLER_H
diff --git a/src/net/tmwa/charserverhandler.h b/src/net/tmwa/charserverhandler.h
index a4fc5c572..ab2a9e587 100644
--- a/src/net/tmwa/charserverhandler.h
+++ b/src/net/tmwa/charserverhandler.h
@@ -72,4 +72,4 @@ class CharServerHandler final : public MessageHandler,
 
 }  // namespace TmwAthena
 
-#endif // NET_TA_CHARSERVERHANDLER_H
+#endif  // NET_TA_CHARSERVERHANDLER_H
diff --git a/src/net/tmwa/chathandler.h b/src/net/tmwa/chathandler.h
index b9a0e71bc..2e1c16d93 100644
--- a/src/net/tmwa/chathandler.h
+++ b/src/net/tmwa/chathandler.h
@@ -63,4 +63,4 @@ class ChatHandler final : public MessageHandler, public Ea::ChatHandler
 
 }  // namespace TmwAthena
 
-#endif // NET_TA_CHATHANDLER_H
+#endif  // NET_TA_CHATHANDLER_H
diff --git a/src/net/tmwa/gamehandler.h b/src/net/tmwa/gamehandler.h
index 37b1d0570..142c644ea 100644
--- a/src/net/tmwa/gamehandler.h
+++ b/src/net/tmwa/gamehandler.h
@@ -62,4 +62,4 @@ class GameHandler final : public MessageHandler, public Ea::GameHandler
 
 }  // namespace TmwAthena
 
-#endif // NET_TA_MAPHANDLER_H
+#endif  // NET_TA_MAPHANDLER_H
diff --git a/src/net/tmwa/generalhandler.h b/src/net/tmwa/generalhandler.h
index 145da6793..ea9952fa2 100644
--- a/src/net/tmwa/generalhandler.h
+++ b/src/net/tmwa/generalhandler.h
@@ -82,4 +82,4 @@ class GeneralHandler final : public MessageHandler,
 
 }  // namespace TmwAthena
 
-#endif // NET_TA_GENERALHANDLER_H
+#endif  // NET_TA_GENERALHANDLER_H
diff --git a/src/net/tmwa/gui/guildtab.h b/src/net/tmwa/gui/guildtab.h
index 950c6ad10..b3729fc5a 100644
--- a/src/net/tmwa/gui/guildtab.h
+++ b/src/net/tmwa/gui/guildtab.h
@@ -34,7 +34,7 @@ namespace TmwAthena
 class GuildTab : public Ea::GuildTab
 {
     public:
-        GuildTab(const Widget2 *const widget);
+        explicit GuildTab(const Widget2 *const widget);
 
         A_DELETE_COPY(GuildTab)
 
diff --git a/src/net/tmwa/gui/partytab.h b/src/net/tmwa/gui/partytab.h
index 08ac9bad7..af6e63338 100644
--- a/src/net/tmwa/gui/partytab.h
+++ b/src/net/tmwa/gui/partytab.h
@@ -34,7 +34,7 @@ namespace TmwAthena
 class PartyTab : public Ea::PartyTab
 {
     public:
-        PartyTab(const Widget2 *const widget);
+        explicit PartyTab(const Widget2 *const widget);
 
         A_DELETE_COPY(PartyTab)
 
diff --git a/src/net/tmwa/guildhandler.h b/src/net/tmwa/guildhandler.h
index 581c9bc2f..d084350f2 100644
--- a/src/net/tmwa/guildhandler.h
+++ b/src/net/tmwa/guildhandler.h
@@ -74,4 +74,4 @@ class GuildHandler final : public Ea::GuildHandler, public MessageHandler
     extern Guild *taGuild;
 }
 
-#endif // NET_TA_GUILDHANDLER_H
+#endif  // namespace TmwAthena
diff --git a/src/net/tmwa/inventoryhandler.h b/src/net/tmwa/inventoryhandler.h
index 124aedd2f..365951d08 100644
--- a/src/net/tmwa/inventoryhandler.h
+++ b/src/net/tmwa/inventoryhandler.h
@@ -62,4 +62,4 @@ class InventoryHandler final : public MessageHandler,
 
 }  // namespace TmwAthena
 
-#endif // NET_TA_INVENTORYHANDLER_H
+#endif  // NET_TA_INVENTORYHANDLER_H
diff --git a/src/net/tmwa/itemhandler.h b/src/net/tmwa/itemhandler.h
index a343b4e8d..00c825588 100644
--- a/src/net/tmwa/itemhandler.h
+++ b/src/net/tmwa/itemhandler.h
@@ -42,4 +42,4 @@ class ItemHandler final : public MessageHandler, public Ea::ItemHandler
 
 }  // namespace TmwAthena
 
-#endif // NET_TA_ITEMHANDLER_H
+#endif  // NET_TA_ITEMHANDLER_H
diff --git a/src/net/tmwa/loginhandler.h b/src/net/tmwa/loginhandler.h
index c327b558b..c1326f274 100644
--- a/src/net/tmwa/loginhandler.h
+++ b/src/net/tmwa/loginhandler.h
@@ -78,4 +78,4 @@ class LoginHandler final : public MessageHandler, public Ea::LoginHandler
 
 }  // namespace TmwAthena
 
-#endif // NET_TA_LOGINHANDLER_H
+#endif  // NET_TA_LOGINHANDLER_H
diff --git a/src/net/tmwa/messagehandler.h b/src/net/tmwa/messagehandler.h
index 79073ffb2..9fd27c8ed 100644
--- a/src/net/tmwa/messagehandler.h
+++ b/src/net/tmwa/messagehandler.h
@@ -58,4 +58,4 @@ typedef const std::auto_ptr<MessageHandler> MessageHandlerPtr;
 
 }
 
-#endif // NET_TA_MESSAGEHANDLER_H
+#endif  // namespace TmwAthena
diff --git a/src/net/tmwa/messagein.h b/src/net/tmwa/messagein.h
index a5db62334..6fc337ae3 100644
--- a/src/net/tmwa/messagein.h
+++ b/src/net/tmwa/messagein.h
@@ -54,4 +54,4 @@ class MessageIn final : public Net::MessageIn
 
 }
 
-#endif // NET_TA_MESSAGEIN_H
+#endif  // namespace TmwAthena
diff --git a/src/net/tmwa/messageout.h b/src/net/tmwa/messageout.h
index 285e333d0..22a6ae458 100644
--- a/src/net/tmwa/messageout.h
+++ b/src/net/tmwa/messageout.h
@@ -46,7 +46,7 @@ class MessageOut final : public Net::MessageOut
         /**
          * Constructor.
          */
-        MessageOut(const short id);
+        explicit MessageOut(const short id);
 
         A_DELETE_COPY(MessageOut)
 
@@ -72,4 +72,4 @@ class MessageOut final : public Net::MessageOut
 
 }
 
-#endif // NET_TA_MESSAGEOUT_H
+#endif  // namespace TmwAthena
diff --git a/src/net/tmwa/network.h b/src/net/tmwa/network.h
index 54d082cb5..521a532a2 100644
--- a/src/net/tmwa/network.h
+++ b/src/net/tmwa/network.h
@@ -69,4 +69,4 @@ class Network final : public Ea::Network
 
 }  // namespace TmwAthena
 
-#endif // NET_TA_NETWORK_H
+#endif  // NET_TA_NETWORK_H
diff --git a/src/net/tmwa/npchandler.h b/src/net/tmwa/npchandler.h
index db7d5ade1..53008f615 100644
--- a/src/net/tmwa/npchandler.h
+++ b/src/net/tmwa/npchandler.h
@@ -84,4 +84,4 @@ class NpcHandler final : public MessageHandler, public Ea::NpcHandler
 
 }  // namespace TmwAthena
 
-#endif // NET_TA_NPCHANDLER_H
+#endif  // NET_TA_NPCHANDLER_H
diff --git a/src/net/tmwa/partyhandler.h b/src/net/tmwa/partyhandler.h
index 0d1ca1f38..bdc945e7e 100644
--- a/src/net/tmwa/partyhandler.h
+++ b/src/net/tmwa/partyhandler.h
@@ -67,4 +67,4 @@ class PartyHandler final : public MessageHandler, public Ea::PartyHandler
 
 }  // namespace TmwAthena
 
-#endif // NET_TA_PARTYHANDLER_H
+#endif  // NET_TA_PARTYHANDLER_H
diff --git a/src/net/tmwa/playerhandler.h b/src/net/tmwa/playerhandler.h
index b8f019d2c..a0c355c40 100644
--- a/src/net/tmwa/playerhandler.h
+++ b/src/net/tmwa/playerhandler.h
@@ -63,4 +63,4 @@ class PlayerHandler final : public MessageHandler, public Ea::PlayerHandler
 
 }  // namespace TmwAthena
 
-#endif // NET_TA_PLAYERHANDLER_H
+#endif  // NET_TA_PLAYERHANDLER_H
diff --git a/src/net/tmwa/protocol.h b/src/net/tmwa/protocol.h
index f40599fa5..86f78c45d 100644
--- a/src/net/tmwa/protocol.h
+++ b/src/net/tmwa/protocol.h
@@ -47,7 +47,7 @@ namespace TmwAthena
 //        KARMA,
 //        MANNER
     };
-}
+}  // namespace TmwAthena
 
 enum
 {
@@ -92,8 +92,9 @@ enum
 #define SMSG_CHAR_DELETE_SUCCEEDED   0x006f
 #define SMSG_CHAR_DELETE_FAILED      0x0070
 #define SMSG_CHAR_MAP_INFO           0x0071
-#define SMSG_CHAR_PASSWORD_RESPONSE  0x0062 /**< Custom packet reply \
-                                              to password change request */
+
+// Custom packet reply to password change request
+#define SMSG_CHAR_PASSWORD_RESPONSE  0x0062
 
 #define SMSG_CHAR_SWITCH_RESPONSE    0x00b3
 #define SMSG_CHANGE_MAP_SERVER       0x0092
@@ -137,8 +138,8 @@ enum
 #define SMSG_BEING_MOVE2             0x0086 /**< New eAthena being moves */
 #define SMSG_BEING_REMOVE            0x0080
 #define SMSG_BEING_CHANGE_LOOKS      0x00c3
-#define SMSG_BEING_CHANGE_LOOKS2     0x01d7 /**< Same as 0x00c3, \
-                                                 but 16 bit ID */
+// Same as 0x00c3, but 16 bit ID
+#define SMSG_BEING_CHANGE_LOOKS2     0x01d7
 #define SMSG_BEING_SELFEFFECT        0x019b
 #define SMSG_BEING_EMOTION           0x00c0
 #define SMSG_BEING_ACTION            0x008a /**< Attack, sit, stand up, ... */
@@ -171,8 +172,8 @@ enum
 #define SMSG_GM_CHAT                 0x009a /**< GM announce */
 #define SMSG_WALK_RESPONSE           0x0087
 
-#define SMSG_TRADE_REQUEST           0x00e5 /**< Receiving a request \
-                                                 to trade */
+// Receiving a request to trade
+#define SMSG_TRADE_REQUEST           0x00e5
 #define SMSG_TRADE_RESPONSE          0x00e7
 #define SMSG_TRADE_ITEM_ADD          0x00e9
 #define SMSG_TRADE_ITEM_ADD_RESPONSE 0x01b1 /**< Not standard eAthena! */
@@ -195,8 +196,8 @@ enum
 #define SMSG_PLAYER_STORAGE_EQUIP    0x00a6 /**< Equipment list for storage */
 #define SMSG_PLAYER_STORAGE_STATUS   0x00f2 /**< Slots used and total slots */
 #define SMSG_PLAYER_STORAGE_ADD      0x00f4 /**< Add item/equip to storage */
-#define SMSG_PLAYER_STORAGE_REMOVE   0x00f6 /**< Remove item/equip \
-                                                 from storage */
+// Remove item/equip from storage
+#define SMSG_PLAYER_STORAGE_REMOVE   0x00f6
 #define SMSG_PLAYER_STORAGE_CLOSE    0x00f8 /**< Storage access closed */
 
 #define SMSG_ADMIN_KICK_ACK          0x00cd
@@ -235,8 +236,8 @@ enum
  **********************************/
 #define CMSG_SERVER_VERSION_REQUEST  0x7530
 
-#define CMSG_CHAR_PASSWORD_CHANGE    0x0061 /**< Custom change \
-                                                 password packet */
+// Custom change password packet
+#define CMSG_CHAR_PASSWORD_CHANGE    0x0061
 #define CMSG_CHAR_SERVER_CONNECT     0x0065
 #define CMSG_CHAR_SELECT             0x0066
 #define CMSG_CHAR_CREATE             0x0067
diff --git a/src/net/tmwa/questhandler.h b/src/net/tmwa/questhandler.h
index f87b27cc0..e24a48f53 100644
--- a/src/net/tmwa/questhandler.h
+++ b/src/net/tmwa/questhandler.h
@@ -49,4 +49,4 @@ class QuestHandler final : public MessageHandler
 
 }  // namespace TmwAthena
 
-#endif // NET_TA_QUESTHANDLER_H
+#endif  // NET_TA_QUESTHANDLER_H
diff --git a/src/net/tmwa/skillhandler.h b/src/net/tmwa/skillhandler.h
index 2dcd60540..b410aff04 100644
--- a/src/net/tmwa/skillhandler.h
+++ b/src/net/tmwa/skillhandler.h
@@ -53,4 +53,4 @@ class SkillHandler final : public MessageHandler, public Ea::SkillHandler
 
 }  // namespace TmwAthena
 
-#endif // NET_TA_SKILLHANDLER_H
+#endif  // NET_TA_SKILLHANDLER_H
diff --git a/src/net/tmwa/tradehandler.h b/src/net/tmwa/tradehandler.h
index 6a4f8f59d..491139369 100644
--- a/src/net/tmwa/tradehandler.h
+++ b/src/net/tmwa/tradehandler.h
@@ -59,4 +59,4 @@ class TradeHandler final : public MessageHandler, public Ea::TradeHandler
 
 }  // namespace TmwAthena
 
-#endif // NET_TA_TRADEHANDLER_H
+#endif  // NET_TA_TRADEHANDLER_H