From 6b5c7e7a5ed32abfc98d9acdebacc50c68a91a1d Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 14 Apr 2013 17:06:02 +0300 Subject: another fixes from cpplint. --- src/net/eathena/adminhandler.h | 2 +- src/net/eathena/beinghandler.cpp | 2 +- src/net/eathena/beinghandler.h | 2 +- src/net/eathena/chathandler.h | 2 +- src/net/eathena/gui/guildtab.h | 2 +- src/net/eathena/gui/partytab.h | 2 +- src/net/eathena/guildhandler.h | 2 +- src/net/eathena/inventoryhandler.h | 2 +- src/net/eathena/messagehandler.h | 2 +- src/net/eathena/messagein.h | 2 +- src/net/eathena/messageout.h | 4 ++-- src/net/eathena/partyhandler.h | 2 +- src/net/eathena/protocol.h | 22 +++++++++++----------- src/net/eathena/tradehandler.h | 2 +- 14 files changed, 25 insertions(+), 25 deletions(-) (limited to 'src/net/eathena') 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 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 -- cgit v1.2.3-60-g2f50