diff options
80 files changed, 192 insertions, 192 deletions
diff --git a/src/account-server/account.hpp b/src/account-server/account.hpp index 71575d7..a8e1ee2 100644 --- a/src/account-server/account.hpp +++ b/src/account-server/account.hpp @@ -18,8 +18,8 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_ACCOUNT_H_ -#define _TMWSERV_ACCOUNT_H_ +#ifndef ACCOUNT_H +#define ACCOUNT_H #include <string> #include <vector> @@ -212,4 +212,4 @@ class Account typedef std::vector< Account * > Accounts; -#endif // _TMWSERV_ACCOUNT_H_ +#endif // ACCOUNT_H diff --git a/src/account-server/accountclient.hpp b/src/account-server/accountclient.hpp index 303627a..faf9458 100644 --- a/src/account-server/accountclient.hpp +++ b/src/account-server/accountclient.hpp @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_ACCOUNTCLIENT_H_ -#define _TMWSERV_ACCOUNTCLIENT_H_ +#ifndef ACCOUNTCLIENT_H +#define ACCOUNTCLIENT_H #include <enet/enet.h> diff --git a/src/account-server/accounthandler.hpp b/src/account-server/accounthandler.hpp index c5793b5..12cca01 100644 --- a/src/account-server/accounthandler.hpp +++ b/src/account-server/accounthandler.hpp @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_ACCOUNTHANDLER_H_ -#define _TMWSERV_ACCOUNTHANDLER_H_ +#ifndef ACCOUNTHANDLER_H +#define ACCOUNTHANDLER_H #include <string> diff --git a/src/account-server/character.hpp b/src/account-server/character.hpp index a78d46a..73554b0 100644 --- a/src/account-server/character.hpp +++ b/src/account-server/character.hpp @@ -18,8 +18,8 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_CHARACTERDATA -#define _TMWSERV_CHARACTERDATA +#ifndef CHARACTERDATA_HPP +#define CHARACTERDATA_HPP #include <string> #include <vector> diff --git a/src/account-server/dalstorage.hpp b/src/account-server/dalstorage.hpp index 3054edc..324a1bd 100644 --- a/src/account-server/dalstorage.hpp +++ b/src/account-server/dalstorage.hpp @@ -18,8 +18,8 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_DALSTORAGE_H_ -#define _TMWSERV_DALSTORAGE_H_ +#ifndef DALSTORAGE_H +#define DALSTORAGE_H #include <list> #include <map> @@ -416,4 +416,4 @@ class DALStorage extern DALStorage *storage; -#endif // _TMWSERV_DALSTORAGE_H_ +#endif // DALSTORAGE_H diff --git a/src/account-server/dalstoragesql.hpp b/src/account-server/dalstoragesql.hpp index 4607cfc..f0d9a69 100644 --- a/src/account-server/dalstoragesql.hpp +++ b/src/account-server/dalstoragesql.hpp @@ -18,8 +18,8 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _MANASERV_DALSTORAGE_SQL_H_ -#define _MANASERV_DALSTORAGE_SQL_H_ +#ifndef _MANASERV_DALSTORAGE_SQL_H +#define _MANASERV_DALSTORAGE_SQL_H #ifdef HAVE_CONFIG_H #include "config.h" @@ -148,4 +148,4 @@ static const char *ONLINE_USERS_TBL_NAME = "mana_online_list"; */ static const char *TRANSACTION_TBL_NAME = "mana_transactions"; -#endif // _MANASERV_DALSTORAGE_SQL_H_ +#endif // _MANASERV_DALSTORAGE_SQL_H diff --git a/src/account-server/serverhandler.hpp b/src/account-server/serverhandler.hpp index dab3cf2..100551b 100644 --- a/src/account-server/serverhandler.hpp +++ b/src/account-server/serverhandler.hpp @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_SERVERHANDLER_H_ -#define _TMWSERV_SERVERHANDLER_H_ +#ifndef SERVERHANDLER_H +#define SERVERHANDLER_H #include <iosfwd> #include <string> diff --git a/src/chat-server/chatchannel.hpp b/src/chat-server/chatchannel.hpp index 273b3b7..b4fc288 100644 --- a/src/chat-server/chatchannel.hpp +++ b/src/chat-server/chatchannel.hpp @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_CHATCHANNEL_H_ -#define _TMWSERV_CHATCHANNEL_H_ +#ifndef CHATCHANNEL_H +#define CHATCHANNEL_H #include <string> #include <vector> diff --git a/src/chat-server/chatchannelmanager.hpp b/src/chat-server/chatchannelmanager.hpp index 71c8fb2..1ebe810 100644 --- a/src/chat-server/chatchannelmanager.hpp +++ b/src/chat-server/chatchannelmanager.hpp @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_CHATCHANNELMANAGER_H_ -#define _TMWSERV_CHATCHANNELMANAGER_H_ +#ifndef CHATCHANNELMANAGER_H +#define CHATCHANNELMANAGER_H #include <list> #include <map> diff --git a/src/chat-server/chatclient.hpp b/src/chat-server/chatclient.hpp index a47945c..4a54605 100644 --- a/src/chat-server/chatclient.hpp +++ b/src/chat-server/chatclient.hpp @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_CHATCLIENT_H_ -#define _TMWSERV_CHATCLIENT_H_ +#ifndef CHATCLIENT_H +#define CHATCLIENT_H #include <map> #include <string> diff --git a/src/chat-server/chathandler.hpp b/src/chat-server/chathandler.hpp index 22d521d..e63ee06 100644 --- a/src/chat-server/chathandler.hpp +++ b/src/chat-server/chathandler.hpp @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_CHATHANDLER_H_ -#define _TMWSERV_CHATHANDLER_H_ +#ifndef CHATHANDLER_H +#define CHATHANDLER_H #include <map> #include <string> diff --git a/src/chat-server/guild.hpp b/src/chat-server/guild.hpp index b0bc744..9b64866 100644 --- a/src/chat-server/guild.hpp +++ b/src/chat-server/guild.hpp @@ -18,8 +18,8 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_CHATSERVER_GUILD_H_ -#define _TMWSERV_CHATSERVER_GUILD_H_ +#ifndef CHATSERVER_GUILD_H +#define CHATSERVER_GUILD_H #include <string> #include <list> diff --git a/src/chat-server/guildmanager.hpp b/src/chat-server/guildmanager.hpp index 26fe48c..d0d74da 100644 --- a/src/chat-server/guildmanager.hpp +++ b/src/chat-server/guildmanager.hpp @@ -18,8 +18,8 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef TMW_CHATSERVER_GUILDMANAGER_H -#define TMW_CHATSERVER_GUILDMANAGER_H +#ifndef CHATSERVER_GUILDMANAGER_H +#define CHATSERVER_GUILDMANAGER_H #include <list> #include <string> diff --git a/src/chat-server/party.hpp b/src/chat-server/party.hpp index 92d476f..be66229 100644 --- a/src/chat-server/party.hpp +++ b/src/chat-server/party.hpp @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_PARTY_H_ -#define _TMWSERV_PARTY_H_ +#ifndef PARTY_H +#define PARTY_H #include <string> #include <vector> diff --git a/src/chat-server/post.hpp b/src/chat-server/post.hpp index 2934db4..6c11a3c 100644 --- a/src/chat-server/post.hpp +++ b/src/chat-server/post.hpp @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_POST_H_ -#define _TMWSERV_POST_H_ +#ifndef POST_H +#define POST_H #include <map> #include <string> diff --git a/src/common/inventorydata.hpp b/src/common/inventorydata.hpp index 5fb7d0a..75e8f5b 100644 --- a/src/common/inventorydata.hpp +++ b/src/common/inventorydata.hpp @@ -18,8 +18,8 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_COMMON_INVENTORYDATA_HPP_ -#define _TMWSERV_COMMON_INVENTORYDATA_HPP_ +#ifndef COMMON_INVENTORYDATA_HPP +#define COMMON_INVENTORYDATA_HPP #include <vector> diff --git a/src/common/transaction.hpp b/src/common/transaction.hpp index 3cdb4d5..0a99548 100644 --- a/src/common/transaction.hpp +++ b/src/common/transaction.hpp @@ -18,8 +18,8 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_TRANSACTION_H_ -#define _TMWSERV_TRANSACTION_H_ +#ifndef TRANSACTION_H +#define TRANSACTION_H struct Transaction { diff --git a/src/dal/dalexcept.h b/src/dal/dalexcept.h index fe0423f..86585c3 100644 --- a/src/dal/dalexcept.h +++ b/src/dal/dalexcept.h @@ -18,8 +18,8 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_DAL_EXCEPT_H_ -#define _TMWSERV_DAL_EXCEPT_H_ +#ifndef DAL_EXCEPT_H +#define DAL_EXCEPT_H #include <string> @@ -165,4 +165,4 @@ class RsColumnHeadersNotSet: public std::exception } // namespace dal -#endif // _TMWSERV_DAL_EXCEPT_H_ +#endif // DAL_EXCEPT_H diff --git a/src/dal/dataprovider.h b/src/dal/dataprovider.h index 1a11176..7878902 100644 --- a/src/dal/dataprovider.h +++ b/src/dal/dataprovider.h @@ -18,8 +18,8 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_DATA_PROVIDER_H_ -#define _TMWSERV_DATA_PROVIDER_H_ +#ifndef DATA_PROVIDER_H +#define DATA_PROVIDER_H #include <string> @@ -200,4 +200,4 @@ class DataProvider } // namespace dal -#endif // _TMWSERV_DATA_PROVIDER_H_ +#endif // DATA_PROVIDER_H diff --git a/src/dal/dataproviderfactory.h b/src/dal/dataproviderfactory.h index ed0f7e1..580d500 100644 --- a/src/dal/dataproviderfactory.h +++ b/src/dal/dataproviderfactory.h @@ -18,8 +18,8 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_DATA_PROVIDER_FACTORY_H_ -#define _TMWSERV_DATA_PROVIDER_FACTORY_H_ +#ifndef DATA_PROVIDER_FACTORY_H +#define DATA_PROVIDER_FACTORY_H namespace dal { @@ -71,4 +71,4 @@ class DataProviderFactory } // namespace dal -#endif // _TMWSERV_DATA_PROVIDER_FACTORY_H_ +#endif // DATA_PROVIDER_FACTORY_H diff --git a/src/dal/mysqldataprovider.h b/src/dal/mysqldataprovider.h index c3ad1ce..73ce017 100644 --- a/src/dal/mysqldataprovider.h +++ b/src/dal/mysqldataprovider.h @@ -18,8 +18,8 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_MYSQL_DATA_PROVIDER_H_ -#define _TMWSERV_MYSQL_DATA_PROVIDER_H_ +#ifndef MYSQL_DATA_PROVIDER_H +#define MYSQL_DATA_PROVIDER_H #include <iosfwd> @@ -174,4 +174,4 @@ class MySqlDataProvider: public DataProvider } // namespace dal -#endif // _TMWSERV_MYSQL_DATA_PROVIDER_H_ +#endif // MYSQL_DATA_PROVIDER_H diff --git a/src/dal/pqdataprovider.h b/src/dal/pqdataprovider.h index 9cbc3cb..65d7d68 100644 --- a/src/dal/pqdataprovider.h +++ b/src/dal/pqdataprovider.h @@ -18,8 +18,8 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_PQDATAPROVIDER_H_ -#define _TMWSERV_PQDATAPROVIDER_H_ +#ifndef PQDATAPROVIDER_H +#define PQDATAPROVIDER_H #include <iosfwd> #include <libpq-fe.h> @@ -96,4 +96,4 @@ class PqDataProvider: public DataProvider } // namespace dal -#endif // _TMWSERV_PQDATAPROVIDER_H_ +#endif // PQDATAPROVIDER_H diff --git a/src/dal/recordset.h b/src/dal/recordset.h index 124123d..3cabe27 100644 --- a/src/dal/recordset.h +++ b/src/dal/recordset.h @@ -18,8 +18,8 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_RECORDSET_H_ -#define _TMWSERV_RECORDSET_H_ +#ifndef RECORDSET_H +#define RECORDSET_H #include <iostream> #include <vector> @@ -178,4 +178,4 @@ class RecordSet } // namespace dal -#endif // _TMWSERV_RECORDSET_H_ +#endif // RECORDSET_H diff --git a/src/dal/sqlitedataprovider.h b/src/dal/sqlitedataprovider.h index e97fa7c..4b4723c 100644 --- a/src/dal/sqlitedataprovider.h +++ b/src/dal/sqlitedataprovider.h @@ -18,8 +18,8 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_SQLITE_DATA_PROVIDER_H_ -#define _TMWSERV_SQLITE_DATA_PROVIDER_H_ +#ifndef SQLITE_DATA_PROVIDER_H +#define SQLITE_DATA_PROVIDER_H #include <iosfwd> #include "limits.h" @@ -184,4 +184,4 @@ class SqLiteDataProvider: public DataProvider } // namespace dal -#endif // _TMWSERV_SQLITE_DATA_PROVIDER_H_ +#endif // SQLITE_DATA_PROVIDER_H diff --git a/src/defines.h b/src/defines.h index 9007351..f4a3b5e 100644 --- a/src/defines.h +++ b/src/defines.h @@ -18,8 +18,8 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_DEFINES_H_ -#define _TMWSERV_DEFINES_H_ +#ifndef DEFINES_H +#define DEFINES_H /** * Enumeration type for account levels. @@ -151,4 +151,4 @@ enum CHAR_ATTR_NB = CHAR_ATTR_END - CHAR_ATTR_BEGIN }; -#endif // _TMWSERV_DEFINES_H_ +#endif // DEFINES_H diff --git a/src/game-server/accountconnection.hpp b/src/game-server/accountconnection.hpp index fc59349..9acb6ab 100644 --- a/src/game-server/accountconnection.hpp +++ b/src/game-server/accountconnection.hpp @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_ACCOUNTCONNECTION_H_ -#define _TMW_ACCOUNTCONNECTION_H_ +#ifndef ACCOUNTCONNECTION_H +#define ACCOUNTCONNECTION_H #include "net/messageout.hpp" #include "net/connection.hpp" @@ -171,4 +171,4 @@ class AccountConnection : public Connection extern AccountConnection *accountHandler; -#endif // _TMW_ACCOUNTCONNECTION_H_ +#endif // ACCOUNTCONNECTION_H diff --git a/src/game-server/actor.hpp b/src/game-server/actor.hpp index e2cc912..0c116c5 100644 --- a/src/game-server/actor.hpp +++ b/src/game-server/actor.hpp @@ -18,8 +18,8 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_ACTOR_H_ -#define _TMWSERV_ACTOR_H_ +#ifndef ACTOR_H +#define ACTOR_H #include "point.h" #include "game-server/map.hpp" @@ -142,4 +142,4 @@ class Actor : public Thing unsigned char mSize; /**< Radius of bounding circle. */ }; -#endif // _TMWSERV_ACTOR_H_ +#endif // ACTOR_H diff --git a/src/game-server/being.hpp b/src/game-server/being.hpp index 35c3bb6..b9cd703 100644 --- a/src/game-server/being.hpp +++ b/src/game-server/being.hpp @@ -18,8 +18,8 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_BEING_H_ -#define _TMWSERV_BEING_H_ +#ifndef BEING_H +#define BEING_H #include <string> #include <vector> @@ -389,4 +389,4 @@ class Being : public Actor Timers mTimers; }; -#endif // _TMWSERV_BEING_H_ +#endif // BEING_H diff --git a/src/game-server/buysell.hpp b/src/game-server/buysell.hpp index b178b38..20c2bcf 100644 --- a/src/game-server/buysell.hpp +++ b/src/game-server/buysell.hpp @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_GAMESERVER_BUYSELL_HPP_ -#define _TMWSERV_GAMESERVER_BUYSELL_HPP_ +#ifndef GAMESERVER_BUYSELL_HPP +#define GAMESERVER_BUYSELL_HPP #include <vector> diff --git a/src/game-server/character.hpp b/src/game-server/character.hpp index 78e9661..c32b46f 100644 --- a/src/game-server/character.hpp +++ b/src/game-server/character.hpp @@ -18,8 +18,8 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_CHARACTER_HPP_ -#define _TMWSERV_CHARACTER_HPP_ +#ifndef CHARACTER_HPP +#define CHARACTER_HPP #include <map> #include <string> @@ -434,4 +434,4 @@ class Character : public Being { return Map::BLOCKTYPE_CHARACTER; } }; -#endif // _TMWSERV_CHARACTER_HPP_ +#endif // CHARACTER_HPP diff --git a/src/game-server/collisiondetection.hpp b/src/game-server/collisiondetection.hpp index d0731e9..f08ce40 100644 --- a/src/game-server/collisiondetection.hpp +++ b/src/game-server/collisiondetection.hpp @@ -18,8 +18,8 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_COLLISIONDETECTION_H -#define _TMW_COLLISIONDETECTION_H +#ifndef COLLISIONDETECTION_H +#define COLLISIONDETECTION_H class Point; diff --git a/src/game-server/commandhandler.hpp b/src/game-server/commandhandler.hpp index 3268c14..63b87a1 100644 --- a/src/game-server/commandhandler.hpp +++ b/src/game-server/commandhandler.hpp @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_SERVER_COMMANDHANDLER_ -#define _TMW_SERVER_COMMANDHANDLER_ +#ifndef SERVER_COMMANDHANDLER_HPP +#define SERVER_COMMANDHANDLER_HPP #include <string> @@ -34,4 +34,4 @@ namespace CommandHandler void handleCommand(Character *player, const std::string &command); } -#endif //_TMW_SERVER_COMMANDHANDLER_H +#endif //SERVER_COMMANDHANDLER_H diff --git a/src/game-server/effect.hpp b/src/game-server/effect.hpp index 15db5d2..a635f11 100644 --- a/src/game-server/effect.hpp +++ b/src/game-server/effect.hpp @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_EFFECT_H -#define _TMWSERV_EFFECT_H +#ifndef EFFECT_H +#define EFFECT_H #include "game-server/actor.hpp" #include "game-server/being.hpp" diff --git a/src/game-server/eventlistener.hpp b/src/game-server/eventlistener.hpp index fe59124..5b8b53b 100644 --- a/src/game-server/eventlistener.hpp +++ b/src/game-server/eventlistener.hpp @@ -18,8 +18,8 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_GAMESERVER_EVENTLISTENER_ -#define _TMWSERV_GAMESERVER_EVENTLISTENER_ +#ifndef GAMESERVER_EVENTLISTENER_HPP +#define GAMESERVER_EVENTLISTENER_HPP class Thing; class Being; diff --git a/src/game-server/gamehandler.hpp b/src/game-server/gamehandler.hpp index e9d9fb2..061984d 100644 --- a/src/game-server/gamehandler.hpp +++ b/src/game-server/gamehandler.hpp @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_SERVER_GAMEHANDLER_ -#define _TMW_SERVER_GAMEHANDLER_ +#ifndef SERVER_GAMEHANDLER_HPP +#define SERVER_GAMEHANDLER_HPP #include "game-server/character.hpp" #include "net/connectionhandler.hpp" diff --git a/src/game-server/item.hpp b/src/game-server/item.hpp index f5e12a5..9bb68ce 100644 --- a/src/game-server/item.hpp +++ b/src/game-server/item.hpp @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_ITEM -#define _TMWSERV_ITEM +#ifndef ITEM_HPP +#define ITEM_HPP #include <vector> diff --git a/src/game-server/itemmanager.hpp b/src/game-server/itemmanager.hpp index 2737642..bc142fd 100644 --- a/src/game-server/itemmanager.hpp +++ b/src/game-server/itemmanager.hpp @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_ITEMMANAGER_H -#define _TMW_ITEMMANAGER_H +#ifndef ITEMMANAGER_H +#define ITEMMANAGER_H #include <string> diff --git a/src/game-server/map.hpp b/src/game-server/map.hpp index 4de34f0..6a5fd6c 100644 --- a/src/game-server/map.hpp +++ b/src/game-server/map.hpp @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_MAP_H -#define _TMW_MAP_H +#ifndef MAP_H +#define MAP_H #include <list> #include <map> diff --git a/src/game-server/mapcomposite.hpp b/src/game-server/mapcomposite.hpp index c55cfcd..669fc7d 100644 --- a/src/game-server/mapcomposite.hpp +++ b/src/game-server/mapcomposite.hpp @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_SERVER_MAPCOMPOSITE_ -#define _TMW_SERVER_MAPCOMPOSITE_ +#ifndef SERVER_MAPCOMPOSITE_HPP +#define SERVER_MAPCOMPOSITE_HPP #include <string> #include <vector> diff --git a/src/game-server/mapmanager.hpp b/src/game-server/mapmanager.hpp index 5abdd78..9aa7688 100644 --- a/src/game-server/mapmanager.hpp +++ b/src/game-server/mapmanager.hpp @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_MAPMANAGER_H -#define _TMW_MAPMANAGER_H +#ifndef MAPMANAGER_H +#define MAPMANAGER_H #include <map> #include <string> diff --git a/src/game-server/monster.hpp b/src/game-server/monster.hpp index f6194e9..b9acc0b 100644 --- a/src/game-server/monster.hpp +++ b/src/game-server/monster.hpp @@ -18,8 +18,8 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_MONSTER_H_ -#define _TMWSERV_MONSTER_H_ +#ifndef MONSTER_H +#define MONSTER_H #include <map> #include <vector> @@ -345,4 +345,4 @@ class Monster : public Being friend struct MonsterTargetEventDispatch; }; -#endif // _TMWSERV_MONSTER_H_ +#endif // MONSTER_H diff --git a/src/game-server/monstermanager.hpp b/src/game-server/monstermanager.hpp index 8af9a66..87795ba 100644 --- a/src/game-server/monstermanager.hpp +++ b/src/game-server/monstermanager.hpp @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_MONSTERMANAGER_HPP_ -#define _TMWSERV_MONSTERMANAGER_HPP_ +#ifndef MONSTERMANAGER_HPP +#define MONSTERMANAGER_HPP #include <string> diff --git a/src/game-server/npc.hpp b/src/game-server/npc.hpp index 279ab6c..46b7157 100644 --- a/src/game-server/npc.hpp +++ b/src/game-server/npc.hpp @@ -18,8 +18,8 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_GAMESERVER_NPC_HPP_ -#define _TMWSERV_GAMESERVER_NPC_HPP_ +#ifndef GAMESERVER_NPC_HPP +#define GAMESERVER_NPC_HPP #include "game-server/being.hpp" diff --git a/src/game-server/postman.hpp b/src/game-server/postman.hpp index ed9d0c1..ae3537a 100644 --- a/src/game-server/postman.hpp +++ b/src/game-server/postman.hpp @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_POSTMAN_H_ -#define _TMW_POSTMAN_H_ +#ifndef POSTMAN_H +#define POSTMAN_H #include <map> diff --git a/src/game-server/quest.hpp b/src/game-server/quest.hpp index 917a093..f1f1d4c 100644 --- a/src/game-server/quest.hpp +++ b/src/game-server/quest.hpp @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_GAMESERVER_QUEST_ -#define _TMWSERV_GAMESERVER_QUEST_ +#ifndef GAMESERVER_QUEST_HPP +#define GAMESERVER_QUEST_HPP #include <string> diff --git a/src/game-server/resourcemanager.hpp b/src/game-server/resourcemanager.hpp index 7c346f1..d8f733c 100644 --- a/src/game-server/resourcemanager.hpp +++ b/src/game-server/resourcemanager.hpp @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_RESOURCE_MANAGER_H -#define _TMW_RESOURCE_MANAGER_H +#ifndef RESOURCE_MANAGER_H +#define RESOURCE_MANAGER_H #include <string> diff --git a/src/game-server/spawnarea.hpp b/src/game-server/spawnarea.hpp index cacec07..bcd618d 100644 --- a/src/game-server/spawnarea.hpp +++ b/src/game-server/spawnarea.hpp @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_SPAWNAREA -#define _TMWSERV_SPAWNAREA +#ifndef SPAWNAREA_HPP +#define SPAWNAREA_HPP #include "point.h" #include "game-server/eventlistener.hpp" diff --git a/src/game-server/state.hpp b/src/game-server/state.hpp index 60e63b0..72d5543 100644 --- a/src/game-server/state.hpp +++ b/src/game-server/state.hpp @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_SERVER_STATE_ -#define _TMW_SERVER_STATE_ +#ifndef SERVER_STATE_HPP +#define SERVER_STATE_HPP #include <string> diff --git a/src/game-server/statuseffect.hpp b/src/game-server/statuseffect.hpp index 46af13c..bd02b83 100644 --- a/src/game-server/statuseffect.hpp +++ b/src/game-server/statuseffect.hpp @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_STATUSEFFECT_H -#define _TMW_STATUSEFFECT_H +#ifndef STATUSEFFECT_H +#define STATUSEFFECT_H class Script; class Being; diff --git a/src/game-server/statusmanager.hpp b/src/game-server/statusmanager.hpp index 6f8f735..af8cefc 100644 --- a/src/game-server/statusmanager.hpp +++ b/src/game-server/statusmanager.hpp @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_STATUSMANAGER_H -#define _TMW_STATUSMANAGER_H +#ifndef STATUSMANAGER_H +#define STATUSMANAGER_H #include <string> diff --git a/src/game-server/thing.hpp b/src/game-server/thing.hpp index 33ffa90..be8919a 100644 --- a/src/game-server/thing.hpp +++ b/src/game-server/thing.hpp @@ -18,8 +18,8 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_THING_H_ -#define _TMWSERV_THING_H_ +#ifndef THING_H +#define THING_H #include <set> @@ -133,4 +133,4 @@ class Thing ThingType mType; /**< Type of this thing. */ }; -#endif // _TMWSERV_THING_H_ +#endif // THING_H diff --git a/src/game-server/trade.hpp b/src/game-server/trade.hpp index 844b6c7..4e0e58e 100644 --- a/src/game-server/trade.hpp +++ b/src/game-server/trade.hpp @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_GAMESERVER_TRADE_HPP_ -#define _TMWSERV_GAMESERVER_TRADE_HPP_ +#ifndef GAMESERVER_TRADE_HPP +#define GAMESERVER_TRADE_HPP #include <vector> diff --git a/src/game-server/trigger.hpp b/src/game-server/trigger.hpp index d99fb76..f24a03d 100644 --- a/src/game-server/trigger.hpp +++ b/src/game-server/trigger.hpp @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_TRIGGER -#define _TMWSERV_TRIGGER +#ifndef TRIGGER_HPP +#define TRIGGER_HPP #include "point.h" #include "game-server/thing.hpp" diff --git a/src/net/bandwidth.hpp b/src/net/bandwidth.hpp index 2129fc9..be4f8f6 100644 --- a/src/net/bandwidth.hpp +++ b/src/net/bandwidth.hpp @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_BANDWIDTH_H_ -#define _TMWSERV_BANDWIDTH_H_ +#ifndef BANDWIDTH_H +#define BANDWIDTH_H #include <map> diff --git a/src/net/connection.hpp b/src/net/connection.hpp index c7eb973..6b258e0 100644 --- a/src/net/connection.hpp +++ b/src/net/connection.hpp @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_CONNECTION_H_ -#define _TMWSERV_CONNECTION_H_ +#ifndef CONNECTION_H +#define CONNECTION_H #include <string> #include <enet/enet.h> diff --git a/src/net/connectionhandler.hpp b/src/net/connectionhandler.hpp index 0b8d300..0e5d6f7 100644 --- a/src/net/connectionhandler.hpp +++ b/src/net/connectionhandler.hpp @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_CONNECTIONHANDLER_H_ -#define _TMWSERV_CONNECTIONHANDLER_H_ +#ifndef CONNECTIONHANDLER_H +#define CONNECTIONHANDLER_H #include <list> #include <string> diff --git a/src/net/messagein.hpp b/src/net/messagein.hpp index 007d59c..b972055 100644 --- a/src/net/messagein.hpp +++ b/src/net/messagein.hpp @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_MESSAGEIN_H_ -#define _TMWSERV_MESSAGEIN_H_ +#ifndef MESSAGEIN_H +#define MESSAGEIN_H #include <iosfwd> diff --git a/src/net/messageout.hpp b/src/net/messageout.hpp index 25ff618..6a49bce 100644 --- a/src/net/messageout.hpp +++ b/src/net/messageout.hpp @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_MESSAGEOUT_H_ -#define _TMWSERV_MESSAGEOUT_H_ +#ifndef MESSAGEOUT_H +#define MESSAGEOUT_H #include <iosfwd> @@ -99,4 +99,4 @@ class MessageOut const MessageOut &msg); }; -#endif //_TMWSERV_MESSAGEOUT_H_ +#endif //MESSAGEOUT_H diff --git a/src/net/netcomputer.hpp b/src/net/netcomputer.hpp index 1724d29..51433d8 100644 --- a/src/net/netcomputer.hpp +++ b/src/net/netcomputer.hpp @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_NETCOMPUTER_H_ -#define _TMWSERV_NETCOMPUTER_H_ +#ifndef NETCOMPUTER_H +#define NETCOMPUTER_H #include <iostream> #include <enet/enet.h> @@ -94,4 +94,4 @@ class NetComputer const NetComputer &comp); }; -#endif // _TMWSERV_NETCOMPUTER_H_ +#endif // NETCOMPUTER_H diff --git a/src/point.h b/src/point.h index 3d3d7c1..d486cf9 100644 --- a/src/point.h +++ b/src/point.h @@ -18,8 +18,8 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_POINT_H_ -#define _TMWSERV_POINT_H_ +#ifndef POINT_H +#define POINT_H #include <algorithm> @@ -87,4 +87,4 @@ class Rectangle } }; -#endif // _TMWSERV_POINT_H_ +#endif // POINT_H diff --git a/src/protocol.h b/src/protocol.h index a4dd1e4..53c7945 100644 --- a/src/protocol.h +++ b/src/protocol.h @@ -18,8 +18,8 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_PROTOCOL_H_ -#define _TMWSERV_PROTOCOL_H_ +#ifndef PROTOCOL_H +#define PROTOCOL_H /** * Enumerated type for communicated messages: @@ -351,4 +351,4 @@ enum { GUILD_EVENT_OFFLINE_PLAYER }; -#endif // _TMWSERV_PROTOCOL_H_ +#endif // PROTOCOL_H diff --git a/src/scripting/luascript.hpp b/src/scripting/luascript.hpp index b5590cf..6a40d86 100644 --- a/src/scripting/luascript.hpp +++ b/src/scripting/luascript.hpp @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef LUASCRIPT_HPP_INCLUDED -#define LUASCRIPT_HPP_INCLUDED +#ifndef LUASCRIPT_HPP +#define LUASCRIPT_HPP extern "C" { #include <lualib.h> @@ -89,4 +89,4 @@ struct LuaRegister static LuaRegister dummy; -#endif // LUASCRIPT_HPP_INCLUDED +#endif // LUASCRIPT_HPP diff --git a/src/scripting/luautil.hpp b/src/scripting/luautil.hpp index 900f243..daa2e77 100644 --- a/src/scripting/luautil.hpp +++ b/src/scripting/luautil.hpp @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_SCRIPTING_LUAUTIL_HPP -#define _TMWSERV_SCRIPTING_LUAUTIL_HPP +#ifndef SCRIPTING_LUAUTIL_HPP +#define SCRIPTING_LUAUTIL_HPP extern "C" { #include <lualib.h> diff --git a/src/scripting/script.hpp b/src/scripting/script.hpp index 1674e48..03aaba3 100644 --- a/src/scripting/script.hpp +++ b/src/scripting/script.hpp @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_SCRIPTING_SCRIPT_HPP -#define _TMWSERV_SCRIPTING_SCRIPT_HPP +#ifndef SCRIPTING_SCRIPT_HPP +#define SCRIPTING_SCRIPT_HPP #include <string> diff --git a/src/serialize/characterdata.hpp b/src/serialize/characterdata.hpp index 0f3f4c5..84a1b7a 100644 --- a/src/serialize/characterdata.hpp +++ b/src/serialize/characterdata.hpp @@ -18,8 +18,8 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_SERIALIZE_CHARACTERDATA_HPP_ -#define _TMWSERV_SERIALIZE_CHARACTERDATA_HPP_ +#ifndef SERIALIZE_CHARACTERDATA_HPP +#define SERIALIZE_CHARACTERDATA_HPP #include <map> diff --git a/src/utils/base64.h b/src/utils/base64.h index 4d2950c..4d6fea6 100644 --- a/src/utils/base64.h +++ b/src/utils/base64.h @@ -27,13 +27,13 @@ +----------------------------------------------------------------------+ */ -#ifndef _TMW_BASE64_H -#define _TMW_BASE64_H +#ifndef BASE64_H +#define BASE64_H extern unsigned char *php_base64_encode(const unsigned char *, int, int *); extern unsigned char *php_base64_decode(const unsigned char *, int, int *); -#endif /* _TMW_BASE64_H */ +#endif /* BASE64_H */ /* * Local variables: diff --git a/src/utils/encryption.h b/src/utils/encryption.h index 117f168..656bffa 100644 --- a/src/utils/encryption.h +++ b/src/utils/encryption.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_UTILS_ENCRYPTION_H -#define _TMW_UTILS_ENCRYPTION_H +#ifndef UTILS_ENCRYPTION_H +#define UTILS_ENCRYPTION_H #include <string> @@ -34,4 +34,4 @@ std::string createRandomPassword(); } -#endif // TMW_UTILS_ENCRYPTION_H +#endif // UTILS_ENCRYPTION_H diff --git a/src/utils/functors.h b/src/utils/functors.h index fefbeb1..5fae121 100644 --- a/src/utils/functors.h +++ b/src/utils/functors.h @@ -18,8 +18,8 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_FUNCTORS_H_ -#define _TMWSERV_FUNCTORS_H_ +#ifndef FUNCTORS_H +#define FUNCTORS_H #include <functional> @@ -74,4 +74,4 @@ struct string_to: public std::unary_function<std::string, T> } // anonymous namespace -#endif // _TMWSERV_FUNCTORS_H_ +#endif // FUNCTORS_H diff --git a/src/utils/logger.h b/src/utils/logger.h index bc3b18d..f19f5b7 100644 --- a/src/utils/logger.h +++ b/src/utils/logger.h @@ -18,8 +18,8 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_LOGGER_H_ -#define _TMWSERV_LOGGER_H_ +#ifndef LOGGER_H +#define LOGGER_H #include <iosfwd> #include <sstream> @@ -167,4 +167,4 @@ class Logger #define LOG_ERROR(msg) LOG(ERROR, msg) #define LOG_FATAL(msg) LOG(FATAL, msg) -#endif // _TMWSERV_LOGGER_H_ +#endif // LOGGER_H diff --git a/src/utils/mathutils.h b/src/utils/mathutils.h index ebada25..3b49b7e 100644 --- a/src/utils/mathutils.h +++ b/src/utils/mathutils.h @@ -18,8 +18,8 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_MATHUTILS_H_ -#define _TMWSERV_MATHUTILS_H_ +#ifndef MATHUTILS_H +#define MATHUTILS_H namespace utils { namespace math { diff --git a/src/utils/processorutils.hpp b/src/utils/processorutils.hpp index 81d83fc..e619066 100644 --- a/src/utils/processorutils.hpp +++ b/src/utils/processorutils.hpp @@ -18,8 +18,8 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_PROCESSORUTILS_HPP -#define _TMWSERV_PROCESSORUTILS_HPP +#ifndef PROCESSORUTILS_HPP +#define PROCESSORUTILS_HPP namespace utils { @@ -47,4 +47,4 @@ namespace utils } // namespace processor } // namespace utils -#endif // _TMWSERV_TOKENDISPENSER_HPP +#endif // TOKENDISPENSER_HPP diff --git a/src/utils/sha256.h b/src/utils/sha256.h index 5e52874..d861d75 100644 --- a/src/utils/sha256.h +++ b/src/utils/sha256.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_UTILS_SHA256_H_ -#define _TMW_UTILS_SHA256_H_ +#ifndef UTILS_SHA256_H +#define UTILS_SHA256_H #include <string> @@ -34,4 +34,4 @@ static const unsigned int SHA256_HASH_LENGTH = 64; */ std::string sha256(const std::string &string); -#endif // _TMW_UTILS_SHA256_H_ +#endif // UTILS_SHA256_H diff --git a/src/utils/singleton.h b/src/utils/singleton.h index 86b9da7..7405c76 100644 --- a/src/utils/singleton.h +++ b/src/utils/singleton.h @@ -18,8 +18,8 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_SINGLETON_H_ -#define _TMWSERV_SINGLETON_H_ +#ifndef SINGLETON_H +#define SINGLETON_H namespace utils { @@ -71,4 +71,4 @@ class Singleton } // namespace utils -#endif // _TMWSERV_SINGLETON_H_ +#endif // SINGLETON_H diff --git a/src/utils/stringfilter.h b/src/utils/stringfilter.h index e62ecf9..c871a4d 100644 --- a/src/utils/stringfilter.h +++ b/src/utils/stringfilter.h @@ -18,8 +18,8 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_SLANGSFILTER_H_ -#define _TMWSERV_SLANGSFILTER_H_ +#ifndef SLANGSFILTER_H +#define SLANGSFILTER_H #include <list> #include <string> diff --git a/src/utils/timer.h b/src/utils/timer.h index 4843c70..32b7260 100644 --- a/src/utils/timer.h +++ b/src/utils/timer.h @@ -18,8 +18,8 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_TIMER_H_ -#define _TMWSERV_TIMER_H_ +#ifndef TIMER_H +#define TIMER_H /* I need a 64-bit unsigned integer */ #ifdef _MSC_VER diff --git a/src/utils/tokencollector.hpp b/src/utils/tokencollector.hpp index 332bd1a..6a6fdd3 100644 --- a/src/utils/tokencollector.hpp +++ b/src/utils/tokencollector.hpp @@ -18,8 +18,8 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_TOKENCOLLECTOR_HPP -#define _TMW_TOKENCOLLECTOR_HPP +#ifndef TOKENCOLLECTOR_HPP +#define TOKENCOLLECTOR_HPP #include <string> #include <list> @@ -135,4 +135,4 @@ class TokenCollector: private TokenCollectorBase Handler *mHandler; }; -#endif // _TMW_TOKENCOLLECTOR_HPP +#endif // TOKENCOLLECTOR_HPP diff --git a/src/utils/tokendispenser.hpp b/src/utils/tokendispenser.hpp index 52240df..6638cc5 100644 --- a/src/utils/tokendispenser.hpp +++ b/src/utils/tokendispenser.hpp @@ -18,8 +18,8 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_TOKENDISPENSER_HPP -#define _TMWSERV_TOKENDISPENSER_HPP +#ifndef TOKENDISPENSER_HPP +#define TOKENDISPENSER_HPP #define MAGIC_TOKEN_LENGTH 32 @@ -42,4 +42,4 @@ namespace utils } // namespace utils -#endif // _TMWSERV_TOKENDISPENSER_HPP +#endif // TOKENDISPENSER_HPP diff --git a/src/utils/trim.hpp b/src/utils/trim.hpp index df44fb0..4f5600c 100644 --- a/src/utils/trim.hpp +++ b/src/utils/trim.hpp @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_UTILS_TRIM_ -#define _TMWSERV_UTILS_TRIM_ +#ifndef UTILS_TRIM_HPP +#define UTILS_TRIM_HPP #include <string> diff --git a/src/utils/xml.hpp b/src/utils/xml.hpp index 24b55f3..fa0c6cb 100644 --- a/src/utils/xml.hpp +++ b/src/utils/xml.hpp @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_XML_H_ -#define _TMWSERV_XML_H_ +#ifndef XML_H +#define XML_H #include <string> #include <libxml/tree.h> diff --git a/src/utils/zlib.hpp b/src/utils/zlib.hpp index c435c71..e74b9f5 100644 --- a/src/utils/zlib.hpp +++ b/src/utils/zlib.hpp @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMWSERV_ZLIB -#define _TMWSERV_ZLIB +#ifndef ZLIB_HPP +#define ZLIB_HPP /** * Inflates either zlib or gzip deflated memory. The inflated memory is |