summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/animatedsprite.h4
-rw-r--r--src/being.h4
-rw-r--r--src/beingmanager.h4
-rw-r--r--src/configlistener.h4
-rw-r--r--src/configuration.h4
-rw-r--r--src/emoteshortcut.h4
-rw-r--r--src/equipment.h4
-rw-r--r--src/floor_item.h4
-rw-r--r--src/flooritemmanager.h4
-rw-r--r--src/game.h4
-rw-r--r--src/gui/browserbox.h4
-rw-r--r--src/gui/button.h4
-rw-r--r--src/gui/buttonbox.h4
-rw-r--r--src/gui/buy.h4
-rw-r--r--src/gui/buysell.h4
-rw-r--r--src/gui/chat.h4
-rw-r--r--src/gui/chatinput.h4
-rw-r--r--src/gui/checkbox.h4
-rw-r--r--src/gui/confirm_dialog.h4
-rw-r--r--src/gui/connection.h4
-rw-r--r--src/gui/debugwindow.h4
-rw-r--r--src/gui/emotecontainer.h4
-rw-r--r--src/gui/emoteshortcutcontainer.h4
-rw-r--r--src/gui/emotewindow.h4
-rw-r--r--src/gui/equipmentwindow.h4
-rw-r--r--src/gui/focushandler.h4
-rw-r--r--src/gui/gccontainer.h4
-rw-r--r--src/gui/gui.h4
-rw-r--r--src/gui/help.h4
-rw-r--r--src/gui/inventorywindow.cpp2
-rw-r--r--src/gui/inventorywindow.h4
-rw-r--r--src/gui/item_amount.h6
-rw-r--r--src/gui/itemcontainer.h4
-rw-r--r--src/gui/itemlinkhandler.h4
-rw-r--r--src/gui/itempopup.h6
-rw-r--r--src/gui/itemshortcutcontainer.h4
-rw-r--r--src/gui/linkhandler.h4
-rw-r--r--src/gui/listbox.h4
-rw-r--r--src/gui/login.h4
-rw-r--r--src/gui/menuwindow.h4
-rw-r--r--src/gui/minimap.h4
-rw-r--r--src/gui/npc_text.h6
-rw-r--r--src/gui/npcintegerdialog.h6
-rw-r--r--src/gui/npclistdialog.h6
-rw-r--r--src/gui/npcstringdialog.h6
-rw-r--r--src/gui/passwordfield.h4
-rw-r--r--src/gui/playerbox.h4
-rw-r--r--src/gui/popupmenu.h4
-rw-r--r--src/gui/progressbar.h4
-rw-r--r--src/gui/radiobutton.h6
-rw-r--r--src/gui/register.h4
-rw-r--r--src/gui/scrollarea.h4
-rw-r--r--src/gui/sdlinput.h4
-rw-r--r--src/gui/sell.h4
-rw-r--r--src/gui/setup.h4
-rw-r--r--src/gui/setup_audio.h4
-rw-r--r--src/gui/setup_joystick.h4
-rw-r--r--src/gui/setup_keyboard.h4
-rw-r--r--src/gui/setup_players.h4
-rw-r--r--src/gui/setup_video.h4
-rw-r--r--src/gui/setuptab.h4
-rw-r--r--src/gui/shoplistbox.h4
-rw-r--r--src/gui/shortcutcontainer.h4
-rw-r--r--src/gui/shortcutwindow.h4
-rw-r--r--src/gui/skill.h4
-rw-r--r--src/gui/slider.h4
-rw-r--r--src/gui/status.h4
-rw-r--r--src/gui/table.h6
-rw-r--r--src/gui/table_model.h6
-rw-r--r--src/gui/textbox.h4
-rw-r--r--src/gui/textfield.h4
-rw-r--r--src/gui/trade.h4
-rw-r--r--src/gui/truetypefont.h4
-rw-r--r--src/gui/viewport.h4
-rw-r--r--src/gui/widgets/layout.h6
-rw-r--r--src/gui/widgets/resizegrip.h4
-rw-r--r--src/gui/widgets/tab.h4
-rw-r--r--src/gui/widgets/tabbedarea.h4
-rw-r--r--src/gui/window.h4
-rw-r--r--src/gui/windowcontainer.h4
-rw-r--r--src/guichanfwd.h4
-rw-r--r--src/item.h4
-rw-r--r--src/itemshortcut.h4
-rw-r--r--src/joystick.h6
-rw-r--r--src/keyboardconfig.h4
-rw-r--r--src/localplayer.h4
-rw-r--r--src/lockedarray.h4
-rw-r--r--src/logindata.h4
-rw-r--r--src/main.cpp2
-rw-r--r--src/main.h4
-rw-r--r--src/map.h4
-rw-r--r--src/monster.h4
-rw-r--r--src/net/beinghandler.h4
-rw-r--r--src/net/buysellhandler.h4
-rw-r--r--src/net/charserverhandler.h4
-rw-r--r--src/net/chathandler.h4
-rw-r--r--src/net/equipmenthandler.h4
-rw-r--r--src/net/inventoryhandler.h4
-rw-r--r--src/net/itemhandler.h4
-rw-r--r--src/net/loginhandler.h4
-rw-r--r--src/net/maploginhandler.h4
-rw-r--r--src/net/messagehandler.h4
-rw-r--r--src/net/messagein.h4
-rw-r--r--src/net/messageout.h4
-rw-r--r--src/net/network.h12
-rw-r--r--src/net/npchandler.h4
-rw-r--r--src/net/partyhandler.h4
-rw-r--r--src/net/playerhandler.h4
-rw-r--r--src/net/protocol.h4
-rw-r--r--src/net/skillhandler.h4
-rw-r--r--src/net/tradehandler.h4
-rw-r--r--src/npc.h4
-rw-r--r--src/openglgraphics.h4
-rw-r--r--src/party.h4
-rw-r--r--src/player.h4
-rw-r--r--src/player_relations.h6
-rw-r--r--src/position.h6
-rw-r--r--src/properties.h4
-rw-r--r--src/recorder.h10
-rw-r--r--src/resources/action.h4
-rw-r--r--src/resources/ambientoverlay.h4
-rw-r--r--src/resources/animation.h4
-rw-r--r--src/resources/buddylist.h6
-rw-r--r--src/resources/colordb.h4
-rw-r--r--src/resources/dye.h4
-rw-r--r--src/resources/emotedb.h4
-rw-r--r--src/resources/image.h4
-rw-r--r--src/resources/imageloader.h4
-rw-r--r--src/resources/imageset.h4
-rw-r--r--src/resources/itemdb.h4
-rw-r--r--src/resources/iteminfo.h4
-rw-r--r--src/resources/mapreader.h4
-rw-r--r--src/resources/monsterdb.h4
-rw-r--r--src/resources/monsterinfo.h4
-rw-r--r--src/resources/music.h4
-rw-r--r--src/resources/npcdb.h4
-rw-r--r--src/resources/resource.h4
-rw-r--r--src/resources/resourcemanager.h4
-rw-r--r--src/resources/soundeffect.h4
-rw-r--r--src/resources/spritedef.h4
-rw-r--r--src/serverinfo.h4
-rw-r--r--src/shopitem.h4
-rw-r--r--src/simpleanimation.h4
-rw-r--r--src/sound.h4
-rw-r--r--src/sprite.h4
-rw-r--r--src/text.h7
-rw-r--r--src/textmanager.h7
-rw-r--r--src/tileset.h4
-rw-r--r--src/utils/base64.h6
-rw-r--r--src/utils/dtor.h4
-rw-r--r--src/utils/gettext.h4
-rw-r--r--src/utils/mutex.h6
-rw-r--r--src/utils/strprintf.h4
-rw-r--r--src/utils/tostring.h4
-rw-r--r--src/utils/trim.h4
-rw-r--r--src/utils/xml.h4
-rw-r--r--src/vector.h6
157 files changed, 341 insertions, 337 deletions
diff --git a/src/animatedsprite.h b/src/animatedsprite.h
index c8a2b3c5..b196b990 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 c47864e8..80295db8 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 267b4655..11721709 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 e62d41ea..51d58144 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 f7a44410..0cc4e29f 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 <cassert>
#include <libxml/xmlwriter.h>
diff --git a/src/emoteshortcut.h b/src/emoteshortcut.h
index 14162f73..3f907e1b 100644
--- a/src/emoteshortcut.h
+++ b/src/emoteshortcut.h
@@ -19,8 +19,8 @@
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef _AETHYRA_EMOTESHORTCUT_H__
-#define _AETHYRA_EMOTESHORTCUT_H__
+#ifndef EMOTESHORTCUT_H__
+#define EMOTESHORTCUT_H__
#define SHORTCUT_EMOTES 12
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 589835b4..a7299bfb 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>
diff --git a/src/game.h b/src/game.h
index f674dbf0..4f512d97 100644
--- a/src/game.h
+++ b/src/game.h
@@ -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 c2c427f4..4290f0a2 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/button.h b/src/gui/button.h
index 51f6cffc..d8ed9fa7 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/buttonbox.h b/src/gui/buttonbox.h
index 1741f7ba..6d0e46b6 100644
--- a/src/gui/buttonbox.h
+++ b/src/gui/buttonbox.h
@@ -19,8 +19,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef _TMW_BUTTONBOX_H
-#define _TMW_BUTTONBOX_H
+#ifndef BUTTONBOX_H
+#define BUTTONBOX_H
#include <string>
diff --git a/src/gui/buy.h b/src/gui/buy.h
index 1b7ebe43..423918ce 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 0f41e9ed..60a6398d 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 e5d0a4a9..176fccb7 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 <fstream>
#include <list>
diff --git a/src/gui/chatinput.h b/src/gui/chatinput.h
index fc5c18a3..d98e120b 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 <guichan/focuslistener.hpp>
diff --git a/src/gui/checkbox.h b/src/gui/checkbox.h
index ea67ec02..d92fc822 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 63a867da..fb8290c8 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/emotecontainer.h b/src/gui/emotecontainer.h
index 2231e01a..8e52a206 100644
--- a/src/gui/emotecontainer.h
+++ b/src/gui/emotecontainer.h
@@ -19,8 +19,8 @@
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef _AETHYRA_EMOTECONTAINER_H__
-#define _AETHYRA_EMOTECONTAINER_H__
+#ifndef EMOTECONTAINER_H__
+#define EMOTECONTAINER_H__
#include <list>
#include <vector>
diff --git a/src/gui/emoteshortcutcontainer.h b/src/gui/emoteshortcutcontainer.h
index f8a07dcc..71485259 100644
--- a/src/gui/emoteshortcutcontainer.h
+++ b/src/gui/emoteshortcutcontainer.h
@@ -19,8 +19,8 @@
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef _AETHYRA_EMOTESHORTCUTCONTAINER_H__
-#define _AETHYRA_EMOTESHORTCUTCONTAINER_H__
+#ifndef EMOTESHORTCUTCONTAINER_H__
+#define EMOTESHORTCUTCONTAINER_H__
#include <vector>
diff --git a/src/gui/emotewindow.h b/src/gui/emotewindow.h
index e92808dc..eaea1f7c 100644
--- a/src/gui/emotewindow.h
+++ b/src/gui/emotewindow.h
@@ -19,8 +19,8 @@
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef _AETHYRA_EMOTEWINDOW_H
-#define _AETHYRA_EMOTEWINDOW_H
+#ifndef EMOTEWINDOW_H
+#define EMOTEWINDOW_H
#include <guichan/actionlistener.hpp>
#include <guichan/selectionlistener.hpp>
diff --git a/src/gui/equipmentwindow.h b/src/gui/equipmentwindow.h
index c50e154e..3a3f37f4 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 03dcb785..0a573645 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 9f45a3f3..9681d44a 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 b4627389..2ba74c0a 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.cpp b/src/gui/inventorywindow.cpp
index da549841..64227c2d 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -109,7 +109,7 @@ void InventoryWindow::logic()
// Adjust widgets
mWeight = _("Weight: ") + mTotalWeight + " g / " +
- mMaxWeight + _(" g Slots: ") +
+ mMaxWeight + _(" g Slots: ") +
toString(player_node->getInventory()->getNumberOfSlotsUsed()) +
"/" + toString(player_node->getInventory()->getInventorySize());
diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h
index e14994df..000112e8 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 0eb940f5..aac06bae 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 <list>
diff --git a/src/gui/itemlinkhandler.h b/src/gui/itemlinkhandler.h
index 973aab75..cd6fd900 100644
--- a/src/gui/itemlinkhandler.h
+++ b/src/gui/itemlinkhandler.h
@@ -19,8 +19,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef _TMW_ITEM_LINK_HANDLER_H_
-#define _TMW_ITEM_LINK_HANDLER_H_
+#ifndef ITEM_LINK_HANDLER_H_
+#define ITEM_LINK_HANDLER_H_
#include "linkhandler.h"
diff --git a/src/gui/itempopup.h b/src/gui/itempopup.h
index 4206671e..8ae2c98f 100644
--- a/src/gui/itempopup.h
+++ b/src/gui/itempopup.h
@@ -20,8 +20,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef _TMW_ITEMPOPUP_H__
-#define _TMW_ITEMPOPUP_H__
+#ifndef ITEMPOPUP_H__
+#define ITEMPOPUP_H__
#include "scrollarea.h"
#include "textbox.h"
@@ -46,4 +46,4 @@ class ItemPopup : public Window
ScrollArea *mItemEffectScroll;
};
-#endif // _TMW_ITEMPOPUP_H__
+#endif // ITEMPOPUP_H__
diff --git a/src/gui/itemshortcutcontainer.h b/src/gui/itemshortcutcontainer.h
index d8ddf110..9b61ca86 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/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 69ba45f4..3d0062bc 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 c8fcc267..b85e5ae1 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 <string>
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 6b2b7f52..b4574ad5 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 f6b059ea..b4b6f1af 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>
@@ -77,4 +77,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 242e3a95..ffeced3d 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>
@@ -86,4 +86,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 033c4bf9..e01bedbd 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 75dfe14c..5aacd26f 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 734b826f..715a9bb5 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 "linkhandler.h"
#include "window.h"
diff --git a/src/gui/progressbar.h b/src/gui/progressbar.h
index e874b56d..ee0a5f81 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 84c552b9..dcd62802 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>
@@ -63,4 +63,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 58106a41..4b95a07b 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>
diff --git a/src/gui/scrollarea.h b/src/gui/scrollarea.h
index 26cba4a6..4fababfa 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 1e0359aa..e4eb0902 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 a91cb6cb..2f5cd736 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 <guichan/actionlistener.hpp>
diff --git a/src/gui/setup_joystick.h b/src/gui/setup_joystick.h
index fec38353..2dc56439 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 <guichan/actionlistener.hpp>
diff --git a/src/gui/setup_keyboard.h b/src/gui/setup_keyboard.h
index 86dd920b..d4966053 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 <string>
diff --git a/src/gui/setup_players.h b/src/gui/setup_players.h
index a1f1e8aa..22c8a9b6 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 <guichan/actionlistener.hpp>
diff --git a/src/gui/setup_video.h b/src/gui/setup_video.h
index e9cfb36e..d863fb64 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 <guichan/actionlistener.hpp>
#include <guichan/keylistener.hpp>
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 c55db889..733af4eb 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/shortcutcontainer.h b/src/gui/shortcutcontainer.h
index 9d0584d3..d841f4d8 100644
--- a/src/gui/shortcutcontainer.h
+++ b/src/gui/shortcutcontainer.h
@@ -19,8 +19,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef _TMW_SHORTCUTCONTAINER_H__
-#define _TMW_SHORTCUTCONTAINER_H__
+#ifndef SHORTCUTCONTAINER_H__
+#define SHORTCUTCONTAINER_H__
#include <guichan/mouselistener.hpp>
#include <guichan/widget.hpp>
diff --git a/src/gui/shortcutwindow.h b/src/gui/shortcutwindow.h
index 3c9bfbea..0168669e 100644
--- a/src/gui/shortcutwindow.h
+++ b/src/gui/shortcutwindow.h
@@ -19,8 +19,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef _TMW_SHORTCUTWINDOW_H
-#define _TMW_SHORTCUTWINDOW_H
+#ifndef SHORTCUTWINDOW_H
+#define SHORTCUTWINDOW_H
#include "window.h"
diff --git a/src/gui/skill.h b/src/gui/skill.h
index 33298e96..955666d9 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 c2add662..c14c5be9 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 795ed533..14a7617e 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 39a48dd5..e3fd8cf6 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>
@@ -148,4 +148,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 cd4bc6db..1c36ca46 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 <set>
#include <vector>
@@ -176,4 +176,4 @@ protected:
virtual void drawBackground(gcn::Graphics *graphics);
};
-#endif /* !defined(TMW_TABLE_MODEL_H_) */
+#endif /* !defined(TABLE_MODEL_H) */
diff --git a/src/gui/textbox.h b/src/gui/textbox.h
index 62385b1e..98b60402 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 4c887546..a2432175 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 910a5183..df724038 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 bb3663cd..288be49a 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 0a140ff9..5ed40166 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 6c517de8..7f1329a2 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 fc808cf4..51b5186d 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/widgetlistener.hpp>
diff --git a/src/gui/windowcontainer.h b/src/gui/windowcontainer.h
index f087db2c..a3e80223 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;
diff --git a/src/item.h b/src/item.h
index 2543b594..3ea4a905 100644
--- a/src/item.h
+++ b/src/item.h
@@ -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 5e448010..95e17f44 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 12
diff --git a/src/joystick.h b/src/joystick.h
index 867bf96a..a7090293 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>
@@ -98,4 +98,4 @@ class Joystick
void doCalibration();
};
-#endif // _TMW_JOYSTICK_H
+#endif // JOYSTICK_H
diff --git a/src/keyboardconfig.h b/src/keyboardconfig.h
index 038a33af..2077126d 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 236d63dc..4e0b205f 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 "player.h"
#include "simpleanimation.h"
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 8490ec94..b933742a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -680,7 +680,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
diff --git a/src/main.h b/src/main.h
index 0fe2b296..df2c4397 100644
--- a/src/main.h
+++ b/src/main.h
@@ -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>
diff --git a/src/map.h b/src/map.h
index 73be3dd2..bd4cb122 100644
--- a/src/map.h
+++ b/src/map.h
@@ -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 ecd90766..8d7f8ae7 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 cb5941fd..54b82075 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 9024136f..c847b4c1 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 <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 5cf7cbb5..0ff6e78a 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 <SDL_types.h>
#include <string>
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 db4d7f07..c035f55c 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/partyhandler.h b/src/net/partyhandler.h
index daabc52f..08d85ad0 100644
--- a/src/net/partyhandler.h
+++ b/src/net/partyhandler.h
@@ -19,8 +19,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef _TMW_NET_PARTYHANDLER_H
-#define _TMW_NET_PARTYHANDLER_H
+#ifndef PARTYHANDLER_H
+#define PARTYHANDLER_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 8f2a2392..fd08c45d 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 *
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"
diff --git a/src/npc.h b/src/npc.h
index 00494060..dd8d7f5d 100644
--- a/src/npc.h
+++ b/src/npc.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 "player.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/party.h b/src/party.h
index 0e1afc3c..8d6dce47 100644
--- a/src/party.h
+++ b/src/party.h
@@ -19,8 +19,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef _TMW_PARTY_H
-#define _TMW_PARTY_H
+#ifndef PARTY_H
+#define PARTY_H
#include <string>
diff --git a/src/player.h b/src/player.h
index 11cccd04..5fe9963a 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 07ec7fcb..0f8bb4e3 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 <list>
#include <map>
@@ -239,4 +239,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 81714dde..91367552 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 <sstream>
diff --git a/src/recorder.h b/src/recorder.h
index c9955fd9..4a220166 100644
--- a/src/recorder.h
+++ b/src/recorder.h
@@ -1,8 +1,8 @@
/*
- * The Mana World
- * Copyright (C) 2004 The Mana World Development Team
+ * Aethyra
+ * Copyright (C) 2008 Aethyra Development Team
*
- * This file is part of The Mana World.
+ * This file is part of Aethyra.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -19,8 +19,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef _TMW_RECORD_H
-#define _TMW_RECORD_H
+#ifndef RECORD_H
+#define RECORD_H
#include <fstream>
#include <string>
diff --git a/src/resources/action.h b/src/resources/action.h
index 1b5f1fc8..649d3828 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 8ebebc6f..0c461ebe 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 40dd125d..d769b2b8 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/colordb.h b/src/resources/colordb.h
index 2b750fa3..da36048a 100644
--- a/src/resources/colordb.h
+++ b/src/resources/colordb.h
@@ -19,8 +19,8 @@
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef _AETHYRA_COLOR_MANAGER_H
-#define _AETHYRA_COLOR_MANAGER_H
+#ifndef COLOR_MANAGER_H
+#define COLOR_MANAGER_H
#include <map>
#include <string>
diff --git a/src/resources/dye.h b/src/resources/dye.h
index 6bec8eb1..1db16c6a 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 <string>
#include <vector>
diff --git a/src/resources/emotedb.h b/src/resources/emotedb.h
index 73354ec0..0962edad 100644
--- a/src/resources/emotedb.h
+++ b/src/resources/emotedb.h
@@ -19,8 +19,8 @@
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef _AETHYRA_EMOTE_DB_H
-#define _AETHYRA_EMOTE_DB_H
+#ifndef EMOTE_DB_H
+#define EMOTE_DB_H
#include <list>
#include <map>
diff --git a/src/resources/image.h b/src/resources/image.h
index 0974b18b..a4048803 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 <SDL.h>
diff --git a/src/resources/imageloader.h b/src/resources/imageloader.h
index 05d7a838..0ac7c899 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 f8939263..f59c76bb 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 78279f4d..e7c23ca2 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 <map>
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h
index 5e98d040..86725ca2 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 bf797690..ef945c3f 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 cee1390b..6fbde55f 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 77130be0..75464035 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 <list>
#include <map>
diff --git a/src/resources/music.h b/src/resources/music.h
index 4d2ffd29..65f1ee88 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 c2bd04e4..af6764bf 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 <list>
#include <map>
diff --git a/src/resources/resource.h b/src/resources/resource.h
index 855d09b8..303b82c8 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 4372195d..7996e816 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 b19142b3..05ec9e54 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 4759ef4e..99d570f1 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 1b47e4c7..05b2def3 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>
#include <string>
diff --git a/src/sprite.h b/src/sprite.h
index 321d6abe..a6384e94 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;
diff --git a/src/text.h b/src/text.h
index 03f2dcbc..43d6b5ea 100644
--- a/src/text.h
+++ b/src/text.h
@@ -18,8 +18,8 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
-#ifndef _AETHYRA_TEXT_H
-#define _AETHYRA_TEXT_H
+#ifndef TEXT_H
+#define TEXT_H
#include "graphics.h"
#include "guichanfwd.h"
@@ -89,4 +89,5 @@ class FlashText : public Text
private:
int mTime; /**< Time left for flashing */
};
-#endif
+
+#endif // TEXT_H
diff --git a/src/textmanager.h b/src/textmanager.h
index 6497c335..a08660d5 100644
--- a/src/textmanager.h
+++ b/src/textmanager.h
@@ -18,8 +18,8 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
-#ifndef _AETHYRA_TEXTMANAGER_H
-#define _AETHYRA_TEXTMANAGER_H
+#ifndef TEXTMANAGER_H
+#define TEXTMANAGER_H
#include <list>
@@ -71,4 +71,5 @@ class TextManager
};
extern TextManager *textManager;
-#endif
+
+#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 399cb8c2..0b71fa50 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 6af5f1ca..2e08dd50 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 <string>
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