diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-01-25 22:00:00 +0100 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-01-25 22:00:00 +0100 |
| commit | 45c59795a2fafd208bb7cdd52dc98a85f2377d2a (patch) | |
| tree | f2b6813237728a9c488d58c99e4483ab31b51946 /src | |
| parent | 65da3d5cd5c8cf40abc1e6d31b04eada615fe307 (diff) | |
| download | mana-45c59795a2fafd208bb7cdd52dc98a85f2377d2a.tar.gz mana-45c59795a2fafd208bb7cdd52dc98a85f2377d2a.tar.bz2 mana-45c59795a2fafd208bb7cdd52dc98a85f2377d2a.tar.xz mana-45c59795a2fafd208bb7cdd52dc98a85f2377d2a.zip | |
Removed the TMW branding from header guards
Diffstat (limited to 'src')
144 files changed, 311 insertions, 309 deletions
diff --git a/src/animatedsprite.h b/src/animatedsprite.h index 77bbc494..43248731 100644 --- a/src/animatedsprite.h +++ b/src/animatedsprite.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_ANIMATEDSPRITE_H -#define _TMW_ANIMATEDSPRITE_H +#ifndef ANIMATEDSPRITE_H +#define ANIMATEDSPRITE_H #include "resources/spritedef.h" diff --git a/src/being.h b/src/being.h index 8c08ecc5..7d5ed989 100644 --- a/src/being.h +++ b/src/being.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_BEING_H -#define _TMW_BEING_H +#ifndef BEING_H +#define BEING_H #include <list> #include <memory> diff --git a/src/beingmanager.h b/src/beingmanager.h index eb437330..017de22e 100644 --- a/src/beingmanager.h +++ b/src/beingmanager.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_BEINGMANAGER_H -#define _TMW_BEINGMANAGER_H +#ifndef BEINGMANAGER_H +#define BEINGMANAGER_H #include "being.h" diff --git a/src/configlistener.h b/src/configlistener.h index 0f033ad8..009a4830 100644 --- a/src/configlistener.h +++ b/src/configlistener.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_CONFIGLISTENER_H -#define _TMW_CONFIGLISTENER_H +#ifndef CONFIGLISTENER_H +#define CONFIGLISTENER_H #include <iosfwd> diff --git a/src/configuration.h b/src/configuration.h index cd96f6a9..9f97e221 100644 --- a/src/configuration.h +++ b/src/configuration.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_CONFIGURATION_H -#define _TMW_CONFIGURATION_H +#ifndef CONFIGURATION_H +#define CONFIGURATION_H #include <map> #include <list> diff --git a/src/equipment.h b/src/equipment.h index 50fcbb32..ace76e63 100644 --- a/src/equipment.h +++ b/src/equipment.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_EQUIPMENT_H_ -#define _TMW_EQUIPMENT_H_ +#ifndef EQUIPMENT_H +#define EQUIPMENT_H class Item; diff --git a/src/floor_item.h b/src/floor_item.h index 3e266d03..e0a67eca 100644 --- a/src/floor_item.h +++ b/src/floor_item.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_FLOORITEM_H_ -#define _TMW_FLOORITEM_H_ +#ifndef FLOORITEM_H +#define FLOORITEM_H #include "graphics.h" #include "item.h" diff --git a/src/flooritemmanager.h b/src/flooritemmanager.h index b527bbd2..3f96b587 100644 --- a/src/flooritemmanager.h +++ b/src/flooritemmanager.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_FLOORITEMMANAGER_H -#define _TMW_FLOORITEMMANAGER_H +#ifndef FLOORITEMMANAGER_H +#define FLOORITEMMANAGER_H #include <list> @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_GAME_ -#define _TMW_GAME_ +#ifndef GAME_ +#define GAME_ #include <iosfwd> #include <memory> diff --git a/src/gui/browserbox.h b/src/gui/browserbox.h index 9b1a4c8e..226be37b 100644 --- a/src/gui/browserbox.h +++ b/src/gui/browserbox.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef __TMW_BROWSERBOX_H__ -#define __TMW_BROWSERBOX_H__ +#ifndef BROWSERBOX_H +#define BROWSERBOX_H #include <iosfwd> #include <vector> diff --git a/src/gui/buddywindow.h b/src/gui/buddywindow.h index ffe2918b..4eed3a2c 100644 --- a/src/gui/buddywindow.h +++ b/src/gui/buddywindow.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_BUDDYWINDOW_H -#define _TMW_BUDDYWINDOW_H +#ifndef BUDDYWINDOW_H +#define BUDDYWINDOW_H #include <guichan/actionlistener.hpp> @@ -53,4 +53,4 @@ class BuddyWindow : public Window, public gcn::ActionListener gcn::ListBox *mListbox; }; -#endif /* _TMW_BUDDYWINDOW_H */ +#endif /* BUDDYWINDOW_H */ diff --git a/src/gui/button.h b/src/gui/button.h index d01147e6..0ec99245 100644 --- a/src/gui/button.h +++ b/src/gui/button.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_BUTTON_H -#define _TMW_BUTTON_H +#ifndef BUTTON_H +#define BUTTON_H #include <iosfwd> diff --git a/src/gui/buy.h b/src/gui/buy.h index d0840591..37a39890 100644 --- a/src/gui/buy.h +++ b/src/gui/buy.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_BUY_H -#define _TMW_BUY_H +#ifndef BUY_H +#define BUY_H #include <guichan/actionlistener.hpp> #include <guichan/selectionlistener.hpp> diff --git a/src/gui/buysell.h b/src/gui/buysell.h index e65f8dc8..e3cdc52a 100644 --- a/src/gui/buysell.h +++ b/src/gui/buysell.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_BUYSELL_H -#define _TMW_BUYSELL_H +#ifndef BUYSELL_H +#define BUYSELL_H #include <guichan/actionlistener.hpp> diff --git a/src/gui/chat.h b/src/gui/chat.h index 2baafdef..ad89c8dc 100644 --- a/src/gui/chat.h +++ b/src/gui/chat.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_CHAT_H -#define _TMW_CHAT_H +#ifndef CHAT_H +#define CHAT_H #include <list> #include <string> diff --git a/src/gui/chatinput.h b/src/gui/chatinput.h index 94e9a45f..07144c5b 100644 --- a/src/gui/chatinput.h +++ b/src/gui/chatinput.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_CHATINPUT_H -#define _TMW_CHATINPUT_H +#ifndef CHATINPUT_H +#define CHATINPUT_H #include "textfield.h" diff --git a/src/gui/checkbox.h b/src/gui/checkbox.h index ad324790..4b312d22 100644 --- a/src/gui/checkbox.h +++ b/src/gui/checkbox.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_CHECKBOX_H -#define _TMW_CHECKBOX_H +#ifndef CHECKBOX_H +#define CHECKBOX_H #include <iosfwd> diff --git a/src/gui/confirm_dialog.h b/src/gui/confirm_dialog.h index 1c7b7817..69b3e9e4 100644 --- a/src/gui/confirm_dialog.h +++ b/src/gui/confirm_dialog.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_OPTION_DIALOG_H -#define _TMW_OPTION_DIALOG_H +#ifndef OPTION_DIALOG_H +#define OPTION_DIALOG_H #include <guichan/actionlistener.hpp> diff --git a/src/gui/connection.h b/src/gui/connection.h index 0cbb8768..3caa611f 100644 --- a/src/gui/connection.h +++ b/src/gui/connection.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_CONNECTION_H -#define _TMW_CONNECTION_H +#ifndef CONNECTION_H +#define CONNECTION_H #include "window.h" diff --git a/src/gui/debugwindow.h b/src/gui/debugwindow.h index 185915a2..00119d15 100644 --- a/src/gui/debugwindow.h +++ b/src/gui/debugwindow.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_DEBUGWINDOW_H -#define _TMW_DEBUGWINDOW_H +#ifndef DEBUGWINDOW_H +#define DEBUGWINDOW_H #include <iosfwd> diff --git a/src/gui/equipmentwindow.h b/src/gui/equipmentwindow.h index a93f4819..e2420134 100644 --- a/src/gui/equipmentwindow.h +++ b/src/gui/equipmentwindow.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_EQUIPMENT_H -#define _TMW_EQUIPMENT_H +#ifndef EQUIPMENTWINDOW_H +#define EQUIPMENTWINDOW_H #include "window.h" #include "../inventory.h" diff --git a/src/gui/focushandler.h b/src/gui/focushandler.h index a183a1c8..124b5472 100644 --- a/src/gui/focushandler.h +++ b/src/gui/focushandler.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_FOCUSHANDLER_H -#define _TMW_FOCUSHANDLER_H +#ifndef FOCUSHANDLER_H +#define FOCUSHANDLER_H #include <list> diff --git a/src/gui/gccontainer.h b/src/gui/gccontainer.h index 996d2d77..da584a42 100644 --- a/src/gui/gccontainer.h +++ b/src/gui/gccontainer.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_GUI_GCCONTAINER_H -#define _TMW_GUI_GCCONTAINER_H +#ifndef GUI_GCCONTAINER_H +#define GUI_GCCONTAINER_H #include <list> diff --git a/src/gui/gui.h b/src/gui/gui.h index c153b8e1..95cd5815 100644 --- a/src/gui/gui.h +++ b/src/gui/gui.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_GUI -#define _TMW_GUI +#ifndef GUI +#define GUI #include <guichan/gui.hpp> diff --git a/src/gui/help.h b/src/gui/help.h index 885f6ef7..e3d9246d 100644 --- a/src/gui/help.h +++ b/src/gui/help.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_HELP_H -#define _TMW_HELP_H +#ifndef HELP_H +#define HELP_H #include <guichan/actionlistener.hpp> diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h index b11304a5..402ab0d2 100644 --- a/src/gui/inventorywindow.h +++ b/src/gui/inventorywindow.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_INVENTORYWINDOW_H -#define _TMW_INVENTORYWINDOW_H +#ifndef INVENTORYWINDOW_H +#define INVENTORYWINDOW_H #include <guichan/actionlistener.hpp> #include <guichan/selectionlistener.hpp> diff --git a/src/gui/item_amount.h b/src/gui/item_amount.h index e6086f82..d8eedadb 100644 --- a/src/gui/item_amount.h +++ b/src/gui/item_amount.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_ITEM_AMOUNT_WINDOW_H -#define _TMW_ITEM_AMOUNT_WINDOW_H +#ifndef ITEM_AMOUNT_WINDOW_H +#define ITEM_AMOUNT_WINDOW_H #include <iosfwd> @@ -69,4 +69,4 @@ class ItemAmountWindow : public Window, public gcn::ActionListener gcn::Slider *mItemAmountSlide; }; -#endif /* _TMW_ITEM_AMOUNT_WINDOW_H */ +#endif /* ITEM_AMOUNT_WINDOW_H */ diff --git a/src/gui/itemcontainer.h b/src/gui/itemcontainer.h index 52b9a84a..a40237af 100644 --- a/src/gui/itemcontainer.h +++ b/src/gui/itemcontainer.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_ITEMCONTAINER_H__ -#define _TMW_ITEMCONTAINER_H__ +#ifndef ITEMCONTAINER_H +#define ITEMCONTAINER_H #include <guichan/mouselistener.hpp> #include <guichan/widget.hpp> diff --git a/src/gui/itemshortcutcontainer.h b/src/gui/itemshortcutcontainer.h index a895b4c7..cdaf6713 100644 --- a/src/gui/itemshortcutcontainer.h +++ b/src/gui/itemshortcutcontainer.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_ITEMSHORTCUTCONTAINER_H__ -#define _TMW_ITEMSHORTCUTCONTAINER_H__ +#ifndef ITEMSHORTCUTCONTAINER_H +#define ITEMSHORTCUTCONTAINER_H #include <guichan/mouselistener.hpp> #include <guichan/widget.hpp> diff --git a/src/gui/itemshortcutwindow.h b/src/gui/itemshortcutwindow.h index 09e221c1..baa34b13 100644 --- a/src/gui/itemshortcutwindow.h +++ b/src/gui/itemshortcutwindow.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_ITEMSHORTCUTWINDOW_H -#define _TMW_ITEMSHORTCUTWINDOW_H +#ifndef ITEMSHORTCUTWINDOW_H +#define ITEMSHORTCUTWINDOW_H #include "window.h" diff --git a/src/gui/linkhandler.h b/src/gui/linkhandler.h index b238f38b..ecc05b13 100644 --- a/src/gui/linkhandler.h +++ b/src/gui/linkhandler.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_LINK_HANDLER_H_ -#define _TMW_LINK_HANDLER_H_ +#ifndef LINK_HANDLER_H +#define LINK_HANDLER_H #include <string> diff --git a/src/gui/listbox.h b/src/gui/listbox.h index f2884913..934ea82e 100644 --- a/src/gui/listbox.h +++ b/src/gui/listbox.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_LISTBOX_H -#define _TMW_LISTBOX_H +#ifndef LISTBOX_H +#define LISTBOX_H #include <guichan/widgets/listbox.hpp> diff --git a/src/gui/login.h b/src/gui/login.h index 2c2663ac..7dd59a96 100644 --- a/src/gui/login.h +++ b/src/gui/login.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_LOGIN_H -#define _TMW_LOGIN_H +#ifndef LOGIN_H +#define LOGIN_H #include <iosfwd> #include <guichan/actionlistener.hpp> diff --git a/src/gui/menuwindow.h b/src/gui/menuwindow.h index 539cdc24..9b784c35 100644 --- a/src/gui/menuwindow.h +++ b/src/gui/menuwindow.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_MENU_H -#define _TMW_MENU_H +#ifndef MENU_H +#define MENU_H #include "window.h" diff --git a/src/gui/minimap.h b/src/gui/minimap.h index 805016e2..67f5eb18 100644 --- a/src/gui/minimap.h +++ b/src/gui/minimap.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_MINIMAP_H -#define _TMW_MINIMAP_H +#ifndef MINIMAP_H +#define MINIMAP_H #include "window.h" diff --git a/src/gui/npc_text.h b/src/gui/npc_text.h index 5bb8e8a5..c881467a 100644 --- a/src/gui/npc_text.h +++ b/src/gui/npc_text.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_NPC_TEXT_H -#define _TMW_NPC_TEXT_H +#ifndef NPC_TEXT_H +#define NPC_TEXT_H #include <iosfwd> #include <guichan/actionlistener.hpp> @@ -82,4 +82,4 @@ class NpcTextDialog : public Window, public gcn::ActionListener BrowserBox *mBrowserBox; }; -#endif // _TMW_NPC_TEXT_H +#endif // NPC_TEXT_H diff --git a/src/gui/npcintegerdialog.h b/src/gui/npcintegerdialog.h index d2c5f058..983c46fe 100644 --- a/src/gui/npcintegerdialog.h +++ b/src/gui/npcintegerdialog.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_GUI_NPCINTEGERDIALOG_H -#define _TMW_GUI_NPCINTEGERDIALOG_H +#ifndef GUI_NPCINTEGERDIALOG_H +#define GUI_NPCINTEGERDIALOG_H #include <iosfwd> #include <vector> @@ -77,4 +77,4 @@ class NpcIntegerDialog : public Window, public gcn::ActionListener, gcn::Button *resetButton; }; -#endif // _TMW_GUI_NPCINTEGERDIALOG_H +#endif // GUI_NPCINTEGERDIALOG_H diff --git a/src/gui/npclistdialog.h b/src/gui/npclistdialog.h index 05c1338b..2ae4aae3 100644 --- a/src/gui/npclistdialog.h +++ b/src/gui/npclistdialog.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_GUI_NPCLISTDIALOG_H -#define _TMW_GUI_NPCLISTDIALOG_H +#ifndef GUI_NPCLISTDIALOG_H +#define GUI_NPCLISTDIALOG_H #include <iosfwd> #include <vector> @@ -91,4 +91,4 @@ class NpcListDialog : public Window, public gcn::ActionListener, std::vector<std::string> mItems; }; -#endif // _TMW_GUI_NPCLISTDIALOG_H +#endif // GUI_NPCLISTDIALOG_H diff --git a/src/gui/npcstringdialog.h b/src/gui/npcstringdialog.h index e57003e9..5aea2de0 100644 --- a/src/gui/npcstringdialog.h +++ b/src/gui/npcstringdialog.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_GUI_NPCSTRINGDIALOG_H -#define _TMW_GUI_NPCSTRINGDIALOG_H +#ifndef GUI_NPCSTRINGDIALOG_H +#define GUI_NPCSTRINGDIALOG_H #include <iosfwd> #include <vector> @@ -75,4 +75,4 @@ class NpcStringDialog : public Window, public gcn::ActionListener gcn::Button *cancelButton; }; -#endif // _TMW_GUI_NPCSTRINGDIALOG_H +#endif // GUI_NPCSTRINGDIALOG_H diff --git a/src/gui/passwordfield.h b/src/gui/passwordfield.h index ff7d4d6b..d6082e3f 100644 --- a/src/gui/passwordfield.h +++ b/src/gui/passwordfield.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_PASSWORDFIELD_H_ -#define _TMW_PASSWORDFIELD_H_ +#ifndef PASSWORDFIELD_H +#define PASSWORDFIELD_H #include "textfield.h" diff --git a/src/gui/playerbox.h b/src/gui/playerbox.h index a8ccd3a9..d66db4d4 100644 --- a/src/gui/playerbox.h +++ b/src/gui/playerbox.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef __TMW_PLAYERBOX_H__ -#define __TMW_PLAYERBOX_H__ +#ifndef PLAYERBOX_H +#define PLAYERBOX_H #include <guichan/widgets/scrollarea.hpp> diff --git a/src/gui/popupmenu.h b/src/gui/popupmenu.h index 8a0068c8..1165bcb2 100644 --- a/src/gui/popupmenu.h +++ b/src/gui/popupmenu.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_POPUP_MENU_H -#define _TMW_POPUP_MENU_H +#ifndef POPUP_MENU_H +#define POPUP_MENU_H #include <SDL.h> // for Uint32 diff --git a/src/gui/progressbar.h b/src/gui/progressbar.h index 3b68fa40..a4b30b04 100644 --- a/src/gui/progressbar.h +++ b/src/gui/progressbar.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_PROGRESSBAR_H -#define _TMW_PROGRESSBAR_H +#ifndef PROGRESSBAR_H +#define PROGRESSBAR_H #include <guichan/widget.hpp> diff --git a/src/gui/radiobutton.h b/src/gui/radiobutton.h index d556e0e3..2d2bdbb7 100644 --- a/src/gui/radiobutton.h +++ b/src/gui/radiobutton.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_RADIOBUTTON_H -#define _TMW_RADIOBUTTON_H +#ifndef RADIOBUTTON_H +#define RADIOBUTTON_H #include <guichan/widgets/radiobutton.hpp> @@ -62,4 +62,4 @@ class RadioButton : public gcn::RadioButton { static Image *radioDisabledChecked; }; -#endif /* _TMW_RADIOBUTTON_H */ +#endif /* RADIOBUTTON_H */ diff --git a/src/gui/register.h b/src/gui/register.h index 23e1f83e..3dddae0f 100644 --- a/src/gui/register.h +++ b/src/gui/register.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_REGISTER_H -#define _TMW_REGISTER_H +#ifndef REGISTER_H +#define REGISTER_H #include <iosfwd> #include <guichan/actionlistener.hpp> diff --git a/src/gui/scrollarea.h b/src/gui/scrollarea.h index 43d62c22..1641f318 100644 --- a/src/gui/scrollarea.h +++ b/src/gui/scrollarea.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef __TMW_SCROLLAREA_H__ -#define __TMW_SCROLLAREA_H__ +#ifndef SCROLLAREA_H +#define SCROLLAREA_H #include <guichan/widgets/scrollarea.hpp> diff --git a/src/gui/sdlinput.h b/src/gui/sdlinput.h index 67eb13a8..3901589a 100644 --- a/src/gui/sdlinput.h +++ b/src/gui/sdlinput.h @@ -55,8 +55,8 @@ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _TMW_SDLINPUT_ -#define _TMW_SDLINPUT_ +#ifndef SDLINPUT_ +#define SDLINPUT_ #include <queue> diff --git a/src/gui/sell.h b/src/gui/sell.h index 0aba2909..8e639a3d 100644 --- a/src/gui/sell.h +++ b/src/gui/sell.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_SELL_H -#define _TMW_SELL_H +#ifndef SELL_H +#define SELL_H #include <guichan/actionlistener.hpp> #include <guichan/selectionlistener.hpp> diff --git a/src/gui/setup.h b/src/gui/setup.h index 98433c90..881961f6 100644 --- a/src/gui/setup.h +++ b/src/gui/setup.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_SETUP_H -#define _TMW_SETUP_H +#ifndef SETUP_H +#define SETUP_H #include <list> diff --git a/src/gui/setup_audio.h b/src/gui/setup_audio.h index 9c5638e8..5345d3cf 100644 --- a/src/gui/setup_audio.h +++ b/src/gui/setup_audio.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_GUI_SETUP_AUDIO_H -#define _TMW_GUI_SETUP_AUDIO_H +#ifndef GUI_SETUP_AUDIO_H +#define GUI_SETUP_AUDIO_H #include "setuptab.h" diff --git a/src/gui/setup_joystick.h b/src/gui/setup_joystick.h index 704af1d0..dd8c331f 100644 --- a/src/gui/setup_joystick.h +++ b/src/gui/setup_joystick.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_GUI_SETUP_JOYSTICK_H -#define _TMW_GUI_SETUP_JOYSTICK_H +#ifndef GUI_SETUP_JOYSTICK_H +#define GUI_SETUP_JOYSTICK_H #include "setuptab.h" diff --git a/src/gui/setup_keyboard.h b/src/gui/setup_keyboard.h index 6e4decc9..f04be792 100644 --- a/src/gui/setup_keyboard.h +++ b/src/gui/setup_keyboard.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_GUI_SETUP_KEYBOARD_H -#define _TMW_GUI_SETUP_KEYBOARD_H +#ifndef GUI_SETUP_KEYBOARD_H +#define GUI_SETUP_KEYBOARD_H #include "setuptab.h" #include "button.h" diff --git a/src/gui/setup_players.h b/src/gui/setup_players.h index fc9cc2d8..d380d9f6 100644 --- a/src/gui/setup_players.h +++ b/src/gui/setup_players.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_GUI_SETUP_PLAYERS_H -#define _TMW_GUI_SETUP_PLAYERS_H +#ifndef GUI_SETUP_PLAYERS_H +#define GUI_SETUP_PLAYERS_H #include "setuptab.h" diff --git a/src/gui/setup_video.h b/src/gui/setup_video.h index 4593e8cf..b7011186 100644 --- a/src/gui/setup_video.h +++ b/src/gui/setup_video.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_GUI_SETUP_VIDEO_H -#define _TMW_GUI_SETUP_VIDEO_H +#ifndef GUI_SETUP_VIDEO_H +#define GUI_SETUP_VIDEO_H #include "setuptab.h" diff --git a/src/gui/setuptab.h b/src/gui/setuptab.h index c1171fdb..3e0c51e2 100644 --- a/src/gui/setuptab.h +++ b/src/gui/setuptab.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_GUI_SETUPTAB_H -#define _TMW_GUI_SETUPTAB_H +#ifndef GUI_SETUPTAB_H +#define GUI_SETUPTAB_H #include "gccontainer.h" diff --git a/src/gui/shoplistbox.h b/src/gui/shoplistbox.h index a859d6ff..bad848d6 100644 --- a/src/gui/shoplistbox.h +++ b/src/gui/shoplistbox.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_SHOPLISTBOX_H -#define _TMW_SHOPLISTBOX_H +#ifndef SHOPLISTBOX_H +#define SHOPLISTBOX_H #include "listbox.h" #include "shop.h" diff --git a/src/gui/skill.h b/src/gui/skill.h index 29b6a8b5..893a61e7 100644 --- a/src/gui/skill.h +++ b/src/gui/skill.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_SKILL_H -#define _TMW_SKILL_H +#ifndef SKILL_H +#define SKILL_H #include <vector> diff --git a/src/gui/slider.h b/src/gui/slider.h index 559829bb..1fe668c5 100644 --- a/src/gui/slider.h +++ b/src/gui/slider.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_SLIDER_H -#define _TMW_SLIDER_H +#ifndef SLIDER_H +#define SLIDER_H #include <guichan/widgets/slider.hpp> diff --git a/src/gui/status.h b/src/gui/status.h index 351dbd8c..6d360caf 100644 --- a/src/gui/status.h +++ b/src/gui/status.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_STATUS_H -#define _TMW_STATUS_H +#ifndef STATUS_H +#define STATUS_H #include <iosfwd> diff --git a/src/gui/table.h b/src/gui/table.h index a3894682..c7ede36c 100644 --- a/src/gui/table.h +++ b/src/gui/table.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef TMW_TABLE_H_ -#define TMW_TABLE_H_ +#ifndef TABLE_H +#define TABLE_H #include <vector> @@ -153,4 +153,4 @@ private: }; -#endif /* !defined(TMW_TABLE_H_) */ +#endif /* !defined(TABLE_H) */ diff --git a/src/gui/table_model.h b/src/gui/table_model.h index 45ee260b..d245d7bd 100644 --- a/src/gui/table_model.h +++ b/src/gui/table_model.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef TMW_TABLE_MODEL_H_ -#define TMW_TABLE_MODEL_H_ +#ifndef TABLE_MODEL_H +#define TABLE_MODEL_H #include "../guichanfwd.h" @@ -143,4 +143,4 @@ protected: std::vector<int> mWidths; }; -#endif /* !defined(TMW_TABLE_MODEL_H_) */ +#endif /* !defined(TABLE_MODEL_H) */ diff --git a/src/gui/textbox.h b/src/gui/textbox.h index 271f7758..a42562ea 100644 --- a/src/gui/textbox.h +++ b/src/gui/textbox.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef __TMW_TEXTBOX_H__ -#define __TMW_TEXTBOX_H__ +#ifndef TEXTBOX_H +#define TEXTBOX_H #include <guichan/widgets/textbox.hpp> diff --git a/src/gui/textfield.h b/src/gui/textfield.h index 90217806..3570f89d 100644 --- a/src/gui/textfield.h +++ b/src/gui/textfield.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef __TMW_TEXTFIELD_H__ -#define __TMW_TEXTFIELD_H__ +#ifndef TEXTFIELD_H +#define TEXTFIELD_H #include <guichan/widgets/textfield.hpp> diff --git a/src/gui/trade.h b/src/gui/trade.h index 98e15fd5..3129c4b9 100644 --- a/src/gui/trade.h +++ b/src/gui/trade.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_TRADE_H -#define _TMW_TRADE_H +#ifndef TRADE_H +#define TRADE_H #include <memory> diff --git a/src/gui/truetypefont.h b/src/gui/truetypefont.h index b58dc560..6f0671a2 100644 --- a/src/gui/truetypefont.h +++ b/src/gui/truetypefont.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_TRUETYPEFONT_H -#define _TMW_TRUETYPEFONT_H +#ifndef TRUETYPEFONT_H +#define TRUETYPEFONT_H #include <string> diff --git a/src/gui/viewport.h b/src/gui/viewport.h index 9ffe6c98..8965ad95 100644 --- a/src/gui/viewport.h +++ b/src/gui/viewport.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_VIEWPORT_H_ -#define _TMW_VIEWPORT_H_ +#ifndef VIEWPORT_H +#define VIEWPORT_H #include <guichan/mouselistener.hpp> diff --git a/src/gui/widgets/layout.h b/src/gui/widgets/layout.h index b9b8b0f8..20a4222d 100644 --- a/src/gui/widgets/layout.h +++ b/src/gui/widgets/layout.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_WIDGET_LAYOUT_H__ -#define _TMW_WIDGET_LAYOUT_H__ +#ifndef WIDGET_LAYOUT_H +#define WIDGET_LAYOUT_H #include <vector> @@ -317,4 +317,4 @@ class Layout: public LayoutCell bool mComputed; }; -#endif // _TMW_WIDGET_LAYOUT_H__ +#endif // WIDGET_LAYOUT_H diff --git a/src/gui/widgets/resizegrip.h b/src/gui/widgets/resizegrip.h index f976bbfa..5c6ea4bd 100644 --- a/src/gui/widgets/resizegrip.h +++ b/src/gui/widgets/resizegrip.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_RESIZEGRIP_H -#define _TMW_RESIZEGRIP_H +#ifndef RESIZEGRIP_H +#define RESIZEGRIP_H #include <guichan/widget.hpp> diff --git a/src/gui/widgets/tab.h b/src/gui/widgets/tab.h index 6b6e06af..8382df83 100644 --- a/src/gui/widgets/tab.h +++ b/src/gui/widgets/tab.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_TAB_H -#define _TMW_TAB_H +#ifndef TAB_H +#define TAB_H #include <guichan/widgets/tab.hpp> diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h index 8d60409a..01d70380 100644 --- a/src/gui/widgets/tabbedarea.h +++ b/src/gui/widgets/tabbedarea.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_TABBEDAREA_H -#define _TMW_TABBEDAREA_H +#ifndef TABBEDAREA_H +#define TABBEDAREA_H #include <guichan/widget.hpp> #include <guichan/widgets/tabbedarea.hpp> diff --git a/src/gui/window.h b/src/gui/window.h index 2c1897fe..19d59c26 100644 --- a/src/gui/window.h +++ b/src/gui/window.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_WINDOW_H__ -#define _TMW_WINDOW_H__ +#ifndef WINDOW_H +#define WINDOW_H #include <guichan/widgets/window.hpp> #include <guichan/widgetlistener.hpp> diff --git a/src/gui/windowcontainer.h b/src/gui/windowcontainer.h index 35848a42..a25f2037 100644 --- a/src/gui/windowcontainer.h +++ b/src/gui/windowcontainer.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_WINDOWCONTAINER_H_ -#define _TMW_WINDOWCONTAINER_H_ +#ifndef WINDOWCONTAINER_H +#define WINDOWCONTAINER_H #include <guichan/widgets/container.hpp> diff --git a/src/guichanfwd.h b/src/guichanfwd.h index 5fd05dbc..2e97db68 100644 --- a/src/guichanfwd.h +++ b/src/guichanfwd.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_GUICHANFWD_H -#define _TMW_GUICHANFWD_H +#ifndef GUICHANFWD_H +#define GUICHANFWD_H namespace gcn { class ActionListener; @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _ITEM_H_ -#define _ITEM_H_ +#ifndef ITEM_H +#define ITEM_H #include "resources/itemdb.h" diff --git a/src/itemshortcut.h b/src/itemshortcut.h index 56341945..bc3f32ca 100644 --- a/src/itemshortcut.h +++ b/src/itemshortcut.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_ITEMSHORTCUT_H__ -#define _TMW_ITEMSHORTCUT_H__ +#ifndef ITEMSHORTCUT_H +#define ITEMSHORTCUT_H #define SHORTCUT_ITEMS 10 diff --git a/src/joystick.h b/src/joystick.h index bf6c21f1..aebd4b5f 100644 --- a/src/joystick.h +++ b/src/joystick.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_JOYSTICK_H -#define _TMW_JOYSTICK_H +#ifndef JOYSTICK_H +#define JOYSTICK_H #include <SDL.h> @@ -96,4 +96,4 @@ class Joystick void doCalibration(); }; -#endif // _TMW_JOYSTICK_H +#endif // JOYSTICK_H diff --git a/src/keyboardconfig.h b/src/keyboardconfig.h index 499709cd..3317460f 100644 --- a/src/keyboardconfig.h +++ b/src/keyboardconfig.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_KEYBOARDCONFIG_H -#define _TMW_KEYBOARDCONFIG_H +#ifndef KEYBOARDCONFIG_H +#define KEYBOARDCONFIG_H #include <string> diff --git a/src/localplayer.h b/src/localplayer.h index a941e32f..6b6486e5 100644 --- a/src/localplayer.h +++ b/src/localplayer.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_LOCALPLAYER_H -#define _TMW_LOCALPLAYER_H +#ifndef LOCALPLAYER_H +#define LOCALPLAYER_H #include <vector> diff --git a/src/lockedarray.h b/src/lockedarray.h index e32f6305..2b4b099d 100644 --- a/src/lockedarray.h +++ b/src/lockedarray.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_LOCKEDARRAY_H -#define _TMW_LOCKEDARRAY_H +#ifndef LOCKEDARRAY_H +#define LOCKEDARRAY_H #include <algorithm> diff --git a/src/logindata.h b/src/logindata.h index ea494e15..410d2e73 100644 --- a/src/logindata.h +++ b/src/logindata.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_LOGINDATA_H -#define _TMW_LOGINDATA_H +#ifndef LOGINDATA_H +#define LOGINDATA_H #include <string> diff --git a/src/main.cpp b/src/main.cpp index dc2f18e3..0291fd86 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -612,7 +612,7 @@ void charLogin(Network *network, LoginData *loginData) outMsg.writeInt32(loginData->session_ID1); outMsg.writeInt32(loginData->session_ID2); // [Fate] The next word is unused by the old char server, so we squeeze in tmw client version information - outMsg.writeInt16(TMW_CLIENT_PROTOCOL_VERSION); + outMsg.writeInt16(CLIENT_PROTOCOL_VERSION); outMsg.writeInt8(loginData->sex); // We get 4 useless bytes before the real answer comes in @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_MAIN_H -#define _TMW_MAIN_H +#ifndef MAIN_H +#define MAIN_H #include <string> @@ -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 <vector> diff --git a/src/monster.h b/src/monster.h index 7e75516d..36812f41 100644 --- a/src/monster.h +++ b/src/monster.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_MONSTER_H -#define _TMW_MONSTER_H +#ifndef MONSTER_H +#define MONSTER_H #include "being.h" diff --git a/src/net/beinghandler.h b/src/net/beinghandler.h index a9d6743b..f72f0380 100644 --- a/src/net/beinghandler.h +++ b/src/net/beinghandler.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_NET_BEINGHANDLER_H -#define _TMW_NET_BEINGHANDLER_H +#ifndef NET_BEINGHANDLER_H +#define NET_BEINGHANDLER_H #include "messagehandler.h" diff --git a/src/net/buysellhandler.h b/src/net/buysellhandler.h index eb1f5853..0ede7b48 100644 --- a/src/net/buysellhandler.h +++ b/src/net/buysellhandler.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_NET_BUYSELLHANDLER_H -#define _TMW_NET_BUYSELLHANDLER_H +#ifndef NET_BUYSELLHANDLER_H +#define NET_BUYSELLHANDLER_H #include "messagehandler.h" diff --git a/src/net/charserverhandler.h b/src/net/charserverhandler.h index 7e711fd9..37b378f2 100644 --- a/src/net/charserverhandler.h +++ b/src/net/charserverhandler.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_NET_CHARSERVERHANDLER_H -#define _TMW_NET_CHARSERVERHANDLER_H +#ifndef NET_CHARSERVERHANDLER_H +#define NET_CHARSERVERHANDLER_H #include "messagehandler.h" diff --git a/src/net/chathandler.h b/src/net/chathandler.h index 6393e401..ff649205 100644 --- a/src/net/chathandler.h +++ b/src/net/chathandler.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_NET_CHATHANDLER_H -#define _TMW_NET_CHATHANDLER_H +#ifndef NET_CHATHANDLER_H +#define NET_CHATHANDLER_H #include "messagehandler.h" diff --git a/src/net/equipmenthandler.h b/src/net/equipmenthandler.h index d477885d..c66d7932 100644 --- a/src/net/equipmenthandler.h +++ b/src/net/equipmenthandler.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_NET_EQUIPMENTHANDLER_H -#define _TMW_NET_EQUIPMENTHANDLER_H +#ifndef NET_EQUIPMENTHANDLER_H +#define NET_EQUIPMENTHANDLER_H #include "messagehandler.h" diff --git a/src/net/inventoryhandler.h b/src/net/inventoryhandler.h index d18e428a..336b2e98 100644 --- a/src/net/inventoryhandler.h +++ b/src/net/inventoryhandler.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_NET_INVENTORYHANDLER_H -#define _TMW_NET_INVENTORYHANDLER_H +#ifndef NET_INVENTORYHANDLER_H +#define NET_INVENTORYHANDLER_H #include "messagehandler.h" diff --git a/src/net/itemhandler.h b/src/net/itemhandler.h index 621b7097..0cb3b42a 100644 --- a/src/net/itemhandler.h +++ b/src/net/itemhandler.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_NET_ITEMHANDLER_H -#define _TMW_NET_ITEMHANDLER_H +#ifndef NET_ITEMHANDLER_H +#define NET_ITEMHANDLER_H #include "messagehandler.h" diff --git a/src/net/loginhandler.h b/src/net/loginhandler.h index d41b8347..a380c767 100644 --- a/src/net/loginhandler.h +++ b/src/net/loginhandler.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_NET_LOGINHANDLER_H -#define _TMW_NET_LOGINHANDLER_H +#ifndef NET_LOGINHANDLER_H +#define NET_LOGINHANDLER_H #include "messagehandler.h" #include <string> diff --git a/src/net/maploginhandler.h b/src/net/maploginhandler.h index a7267372..c7fee70c 100644 --- a/src/net/maploginhandler.h +++ b/src/net/maploginhandler.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_NET_MAPLOGINHANDLER_H -#define _TMW_NET_MAPLOGINHANDLER_H +#ifndef NET_MAPLOGINHANDLER_H +#define NET_MAPLOGINHANDLER_H #include "messagehandler.h" diff --git a/src/net/messagehandler.h b/src/net/messagehandler.h index f46da788..45cdf8cd 100644 --- a/src/net/messagehandler.h +++ b/src/net/messagehandler.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_NET_MESSAGEHANDLER_H -#define _TMW_NET_MESSAGEHANDLER_H +#ifndef NET_MESSAGEHANDLER_H +#define NET_MESSAGEHANDLER_H #include <SDL_types.h> diff --git a/src/net/messagein.h b/src/net/messagein.h index 534d289c..1788aa97 100644 --- a/src/net/messagein.h +++ b/src/net/messagein.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_MESSAGEIN_ -#define _TMW_MESSAGEIN_ +#ifndef MESSAGEIN_ +#define MESSAGEIN_ #include <string> #include <SDL_types.h> diff --git a/src/net/messageout.h b/src/net/messageout.h index d377229a..b3a4ef68 100644 --- a/src/net/messageout.h +++ b/src/net/messageout.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_MESSAGEOUT_ -#define _TMW_MESSAGEOUT_ +#ifndef MESSAGEOUT_ +#define MESSAGEOUT_ #include <iosfwd> #include <SDL_types.h> diff --git a/src/net/network.h b/src/net/network.h index af4055d4..c942a819 100644 --- a/src/net/network.h +++ b/src/net/network.h @@ -19,17 +19,19 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_NETWORK_ -#define _TMW_NETWORK_ +#ifndef NETWORK_ +#define NETWORK_ #include <map> #include <SDL_net.h> #include <SDL_thread.h> #include <string> -#define TMW_CLIENT_PROTOCOL_VERSION 1 - /**< Protocol version, reported to the eAthena char and mapserver who - can adjust the protocol accordingly */ +/** + * Protocol version, reported to the eAthena char and mapserver who can adjust + * the protocol accordingly. + */ +#define CLIENT_PROTOCOL_VERSION 1 class MessageHandler; class MessageIn; diff --git a/src/net/npchandler.h b/src/net/npchandler.h index f47af523..7ac962eb 100644 --- a/src/net/npchandler.h +++ b/src/net/npchandler.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_NET_NPCHANDLER_H -#define _TMW_NET_NPCHANDLER_H +#ifndef NET_NPCHANDLER_H +#define NET_NPCHANDLER_H #include "messagehandler.h" diff --git a/src/net/playerhandler.h b/src/net/playerhandler.h index ceefadf6..1a7c8da3 100644 --- a/src/net/playerhandler.h +++ b/src/net/playerhandler.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_NET_PLAYERHANDLER_H -#define _TMW_NET_PLAYERHANDLER_H +#ifndef NET_PLAYERHANDLER_H +#define NET_PLAYERHANDLER_H #include "messagehandler.h" diff --git a/src/net/protocol.h b/src/net/protocol.h index 86ab9066..b70834c6 100644 --- a/src/net/protocol.h +++ b/src/net/protocol.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_PROTOCOL_ -#define _TMW_PROTOCOL_ +#ifndef PROTOCOL_ +#define PROTOCOL_ // Packets from server to client #define SMSG_LOGIN_SUCCESS 0x0073 /**< Contains starting location */ diff --git a/src/net/skillhandler.h b/src/net/skillhandler.h index 44a0f894..2b55605d 100644 --- a/src/net/skillhandler.h +++ b/src/net/skillhandler.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_NET_SKILLHANDLER_H -#define _TMW_NET_SKILLHANDLER_H +#ifndef NET_SKILLHANDLER_H +#define NET_SKILLHANDLER_H #include "messagehandler.h" diff --git a/src/net/tradehandler.h b/src/net/tradehandler.h index 730c6971..d479e43f 100644 --- a/src/net/tradehandler.h +++ b/src/net/tradehandler.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_NET_TRADEHANDLER_H -#define _TMW_NET_TRADEHANDLER_H +#ifndef NET_TRADEHANDLER_H +#define NET_TRADEHANDLER_H #include "messagehandler.h" @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_NPC_H -#define _TMW_NPC_H +#ifndef NPC_H +#define NPC_H #include "being.h" diff --git a/src/openglgraphics.h b/src/openglgraphics.h index 6ff80bcc..566d6252 100644 --- a/src/openglgraphics.h +++ b/src/openglgraphics.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_OPENGLGRAPHICS_H -#define _TMW_OPENGLGRAPHICS_H +#ifndef OPENGLGRAPHICS_H +#define OPENGLGRAPHICS_H #include "graphics.h" diff --git a/src/player.h b/src/player.h index 35694595..7fe2a09c 100644 --- a/src/player.h +++ b/src/player.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_PLAYER_H -#define _TMW_PLAYER_H +#ifndef PLAYER_H +#define PLAYER_H #include "being.h" #include "text.h" diff --git a/src/player_relations.h b/src/player_relations.h index bc044ca8..6cbaf6b3 100644 --- a/src/player_relations.h +++ b/src/player_relations.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef TMW_PLAYER_RELATIONS_H_ -#define TMW_PLAYER_RELATIONS_H_ +#ifndef PLAYER_RELATIONS_H +#define PLAYER_RELATIONS_H #include "being.h" #include "player.h" @@ -238,4 +238,4 @@ private: extern PlayerRelationsManager player_relations; // singleton representation of player relations -#endif /* !defined(TMW_PLAYER_RELATIONS_H_) */ +#endif /* !defined(PLAYER_RELATIONS_H) */ diff --git a/src/position.h b/src/position.h index 7ef01466..cbcf8c99 100644 --- a/src/position.h +++ b/src/position.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef TMW_POSITION_H -#define TMW_POSITION_H +#ifndef POSITION_H +#define POSITION_H #include <list> #include <iostream> @@ -55,4 +55,4 @@ std::ostream& operator <<(std::ostream &os, const Position &p); */ std::ostream& operator <<(std::ostream &os, const Path &path); -#endif // TMW_POSITION_H +#endif // POSITION_H diff --git a/src/properties.h b/src/properties.h index 4d611297..016d607a 100644 --- a/src/properties.h +++ b/src/properties.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_PROPERTIES_H_ -#define _TMW_PROPERTIES_H_ +#ifndef PROPERTIES_H +#define PROPERTIES_H #include <map> #include <string> diff --git a/src/resources/action.h b/src/resources/action.h index bfb5d892..c557e6da 100644 --- a/src/resources/action.h +++ b/src/resources/action.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_ACTION_H -#define _TMW_ACTION_H +#ifndef ACTION_H +#define ACTION_H #include <map> diff --git a/src/resources/ambientoverlay.h b/src/resources/ambientoverlay.h index 1b03a19c..65f9891d 100644 --- a/src/resources/ambientoverlay.h +++ b/src/resources/ambientoverlay.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_RESOURCES_AMBIENTOVERLAY_H_ -#define _TMW_RESOURCES_AMBIENTOVERLAY_H_ +#ifndef RESOURCES_AMBIENTOVERLAY_H +#define RESOURCES_AMBIENTOVERLAY_H class Graphics; class Image; diff --git a/src/resources/animation.h b/src/resources/animation.h index 9f161e15..29c99209 100644 --- a/src/resources/animation.h +++ b/src/resources/animation.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_ANIMATION_H -#define _TMW_ANIMATION_H +#ifndef ANIMATION_H +#define ANIMATION_H #include <vector> diff --git a/src/resources/buddylist.h b/src/resources/buddylist.h index ef5c0d48..33fcde4d 100644 --- a/src/resources/buddylist.h +++ b/src/resources/buddylist.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_BUDDYLIST_H -#define _TMW_BUDDYLIST_H +#ifndef BUDDYLIST_H +#define BUDDYLIST_H #include <list> #include <string> @@ -76,4 +76,4 @@ class BuddyList : public gcn::ListModel { std::string mFilename; /* File to work with */ }; -#endif /* _TMW_BUDDYLIST_H */ +#endif /* BUDDYLIST_H */ diff --git a/src/resources/dye.h b/src/resources/dye.h index 305423b0..d32c3f22 100644 --- a/src/resources/dye.h +++ b/src/resources/dye.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_DYE_H -#define _TMW_DYE_H +#ifndef DYE_H +#define DYE_H #include <vector> diff --git a/src/resources/image.h b/src/resources/image.h index 2c0569f9..963fbb24 100644 --- a/src/resources/image.h +++ b/src/resources/image.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_IMAGE_H -#define _TMW_IMAGE_H +#ifndef IMAGE_H +#define IMAGE_H #include "../main.h" diff --git a/src/resources/imageloader.h b/src/resources/imageloader.h index bb9d3c0c..1d6c9ae4 100644 --- a/src/resources/imageloader.h +++ b/src/resources/imageloader.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_IMAGELOADER_H -#define _TMW_IMAGELOADER_H +#ifndef IMAGELOADER_H +#define IMAGELOADER_H #include <string> diff --git a/src/resources/imageset.h b/src/resources/imageset.h index 605cf19b..00a36754 100644 --- a/src/resources/imageset.h +++ b/src/resources/imageset.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_IMAGESET_H -#define _TMW_IMAGESET_H +#ifndef IMAGESET_H +#define IMAGESET_H #include <vector> diff --git a/src/resources/itemdb.h b/src/resources/itemdb.h index 7510da97..03fb1eed 100644 --- a/src/resources/itemdb.h +++ b/src/resources/itemdb.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_ITEM_MANAGER_H -#define _TMW_ITEM_MANAGER_H +#ifndef ITEM_MANAGER_H +#define ITEM_MANAGER_H #include "iteminfo.h" diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h index 7f0d548f..a04213ff 100644 --- a/src/resources/iteminfo.h +++ b/src/resources/iteminfo.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_ITEMINFO_H_ -#define _TMW_ITEMINFO_H_ +#ifndef ITEMINFO_H +#define ITEMINFO_H #include <map> #include <string> diff --git a/src/resources/mapreader.h b/src/resources/mapreader.h index 3eba83e0..8cb2749d 100644 --- a/src/resources/mapreader.h +++ b/src/resources/mapreader.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_MAPREADER_H_ -#define _TMW_MAPREADER_H_ +#ifndef MAPREADER_H +#define MAPREADER_H #include <iosfwd> diff --git a/src/resources/monsterdb.h b/src/resources/monsterdb.h index c8cd95bd..8555670b 100644 --- a/src/resources/monsterdb.h +++ b/src/resources/monsterdb.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_MONSTER_DB_H -#define _TMW_MONSTER_DB_H +#ifndef MONSTER_DB_H +#define MONSTER_DB_H #include <map> diff --git a/src/resources/monsterinfo.h b/src/resources/monsterinfo.h index 076f9e95..b37ac1a9 100644 --- a/src/resources/monsterinfo.h +++ b/src/resources/monsterinfo.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_MONSTERINFO_H_ -#define _TMW_MONSTERINFO_H_ +#ifndef MONSTERINFO_H +#define MONSTERINFO_H #include <map> #include <string> diff --git a/src/resources/music.h b/src/resources/music.h index 709a9ff6..cff18338 100644 --- a/src/resources/music.h +++ b/src/resources/music.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_MUSIC_H -#define _TMW_MUSIC_H +#ifndef MUSIC_H +#define MUSIC_H #include <SDL_mixer.h> diff --git a/src/resources/npcdb.h b/src/resources/npcdb.h index bafb5e38..a7f28c50 100644 --- a/src/resources/npcdb.h +++ b/src/resources/npcdb.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_NPC_DB_H -#define _TMW_NPC_DB_H +#ifndef NPC_DB_H +#define NPC_DB_H #include <map> #include <list> diff --git a/src/resources/resource.h b/src/resources/resource.h index ebbdf90c..0dc50c03 100644 --- a/src/resources/resource.h +++ b/src/resources/resource.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_RESOURCE_H -#define _TMW_RESOURCE_H +#ifndef RESOURCE_H +#define RESOURCE_H #include <ctime> #include <string> diff --git a/src/resources/resourcemanager.h b/src/resources/resourcemanager.h index e6e37d25..6a7a2ed6 100644 --- a/src/resources/resourcemanager.h +++ b/src/resources/resourcemanager.h @@ -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 <ctime> #include <map> diff --git a/src/resources/soundeffect.h b/src/resources/soundeffect.h index 23c1ec2a..5f511b29 100644 --- a/src/resources/soundeffect.h +++ b/src/resources/soundeffect.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_SOUND_EFFECT_H -#define _TMW_SOUND_EFFECT_H +#ifndef SOUND_EFFECT_H +#define SOUND_EFFECT_H #include <SDL_mixer.h> diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h index 4628e53e..b86a4c4d 100644 --- a/src/resources/spritedef.h +++ b/src/resources/spritedef.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_SPRITEDEF_H -#define _TMW_SPRITEDEF_H +#ifndef SPRITEDEF_H +#define SPRITEDEF_H #include <map> #include <string> diff --git a/src/serverinfo.h b/src/serverinfo.h index d3be62fa..c38d13c7 100644 --- a/src/serverinfo.h +++ b/src/serverinfo.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_SERVERINFO_ -#define _TMW_SERVERINFO_ +#ifndef SERVERINFO_ +#define SERVERINFO_ #include <string> diff --git a/src/shopitem.h b/src/shopitem.h index 7da77cdf..3353ebe7 100644 --- a/src/shopitem.h +++ b/src/shopitem.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _SHOPITEM_H_ -#define _SHOPITEM_H_ +#ifndef _SHOPITEM_H +#define _SHOPITEM_H #include "item.h" diff --git a/src/simpleanimation.h b/src/simpleanimation.h index ce8832c3..a7178145 100644 --- a/src/simpleanimation.h +++ b/src/simpleanimation.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_SIMPLEANIMAION_H -#define _TMW_SIMPLEANIMAION_H +#ifndef SIMPLEANIMAION_H +#define SIMPLEANIMAION_H #include "resources/animation.h" diff --git a/src/sound.h b/src/sound.h index 78e085c8..88336572 100644 --- a/src/sound.h +++ b/src/sound.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_SOUND_H -#define _TMW_SOUND_H +#ifndef SOUND_H +#define SOUND_H #include <SDL_mixer.h> diff --git a/src/sprite.h b/src/sprite.h index 64dd6aa4..624e4e8b 100644 --- a/src/sprite.h +++ b/src/sprite.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_SPRITE_H_ -#define _TMW_SPRITE_H_ +#ifndef SPRITE_H +#define SPRITE_H class Graphics; @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_TEXT_H -#define _TMW_TEXT_H +#ifndef TEXT_H +#define TEXT_H #include "graphics.h" @@ -92,4 +92,4 @@ class FlashText : public Text int mTime; /**< Time left for flashing. */ }; -#endif // _TMW_TEXT_H +#endif // TEXT_H diff --git a/src/textmanager.h b/src/textmanager.h index c72491b5..fd0006c9 100644 --- a/src/textmanager.h +++ b/src/textmanager.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_TEXTMANAGER_H -#define _TMW_TEXTMANAGER_H +#ifndef TEXTMANAGER_H +#define TEXTMANAGER_H #include <list> @@ -73,4 +73,4 @@ class TextManager extern TextManager *textManager; -#endif // _TMW_TEXTMANAGER_H +#endif // TEXTMANAGER_H diff --git a/src/tileset.h b/src/tileset.h index 040f7ef8..d4de7ba5 100644 --- a/src/tileset.h +++ b/src/tileset.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_TILESET_H_ -#define _TMW_TILESET_H_ +#ifndef TILESET_H +#define TILESET_H #include "resources/imageset.h" diff --git a/src/utils/base64.h b/src/utils/base64.h index c802207b..92c23016 100644 --- a/src/utils/base64.h +++ b/src/utils/base64.h @@ -27,10 +27,10 @@ +----------------------------------------------------------------------+ */ -#ifndef _TMW_BASE64_H -#define _TMW_BASE64_H +#ifndef BASE64_H +#define BASE64_H extern unsigned char *php3_base64_encode(const unsigned char *, int, int *); extern unsigned char *php3_base64_decode(const unsigned char *, int, int *); -#endif /* _TMW_BASE64_H */ +#endif /* BASE64_H */ diff --git a/src/utils/dtor.h b/src/utils/dtor.h index 26f103b9..8dbc441f 100644 --- a/src/utils/dtor.h +++ b/src/utils/dtor.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_UTILS_DTOR_H -#define _TMW_UTILS_DTOR_H +#ifndef UTILS_DTOR_H +#define UTILS_DTOR_H #include <algorithm> #include <functional> diff --git a/src/utils/gettext.h b/src/utils/gettext.h index 74502bb0..5281d491 100644 --- a/src/utils/gettext.h +++ b/src/utils/gettext.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_UTILS_GETTEXT_H -#define _TMW_UTILS_GETTEXT_H +#ifndef UTILS_GETTEXT_H +#define UTILS_GETTEXT_H #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/src/utils/mutex.h b/src/utils/mutex.h index 31e43e33..5e5df8f8 100644 --- a/src/utils/mutex.h +++ b/src/utils/mutex.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef TMW_MUTEX_H -#define TMW_MUTEX_H +#ifndef MUTEX_H +#define MUTEX_H #include <SDL_thread.h> @@ -94,4 +94,4 @@ inline MutexLocker::~MutexLocker() mMutex->unlock(); } -#endif // TMW_MUTEX_H +#endif // MUTEX_H diff --git a/src/utils/strprintf.h b/src/utils/strprintf.h index 98ef5065..78e7a04c 100644 --- a/src/utils/strprintf.h +++ b/src/utils/strprintf.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_UTILS_STRPRINTF_H -#define _TMW_UTILS_STRPRINTF_H +#ifndef UTILS_STRPRINTF_H +#define UTILS_STRPRINTF_H #include <string> diff --git a/src/utils/tostring.h b/src/utils/tostring.h index 0c3b600f..5ac1d3aa 100644 --- a/src/utils/tostring.h +++ b/src/utils/tostring.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_UTILS_TOSTRING_H -#define _TMW_UTILS_TOSTRING_H +#ifndef UTILS_TOSTRING_H +#define UTILS_TOSTRING_H #include <sstream> diff --git a/src/utils/trim.h b/src/utils/trim.h index 9d0d5600..b7474ac7 100644 --- a/src/utils/trim.h +++ b/src/utils/trim.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_UTILS_TRIM_H_ -#define _TMW_UTILS_TRIM_H_ +#ifndef UTILS_TRIM_H +#define UTILS_TRIM_H #include <string> diff --git a/src/utils/xml.h b/src/utils/xml.h index b2f59c1a..76a63ff4 100644 --- a/src/utils/xml.h +++ b/src/utils/xml.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_XML_H -#define _TMW_XML_H +#ifndef XML_H +#define XML_H #include <libxml/tree.h> diff --git a/src/vector.h b/src/vector.h index cd477301..6dd461ac 100644 --- a/src/vector.h +++ b/src/vector.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_VECTOR_H_ -#define _TMW_VECTOR_H_ +#ifndef VECTOR_H +#define VECTOR_H #include <math.h> @@ -187,4 +187,4 @@ class Vector */ std::ostream& operator <<(std::ostream &os, const Vector &v); -#endif // _TMW_VECTOR_H_ +#endif // VECTOR_H |