summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-07-07 22:52:35 +0300
committerAndrei Karas <akaras@inbox.ru>2011-07-07 22:52:35 +0300
commit5e14ab971129eb95ca02e373fc21adb46c0eaca1 (patch)
tree5316f688c7f617776b7e70c9f64932fe7596cadb
parented950471f7ae02c4618fa995c305832f12dc9cd7 (diff)
downloadManaVerse-5e14ab971129eb95ca02e373fc21adb46c0eaca1.tar.gz
ManaVerse-5e14ab971129eb95ca02e373fc21adb46c0eaca1.tar.bz2
ManaVerse-5e14ab971129eb95ca02e373fc21adb46c0eaca1.tar.xz
ManaVerse-5e14ab971129eb95ca02e373fc21adb46c0eaca1.zip
Remove undescore from variables and defines.
-rw-r--r--src/actorspritemanager.h4
-rw-r--r--src/being.cpp6
-rw-r--r--src/being.h4
-rw-r--r--src/chatlog.h4
-rw-r--r--src/client.cpp8
-rw-r--r--src/client.h4
-rw-r--r--src/commandhandler.cpp112
-rw-r--r--src/commandhandler.h32
-rw-r--r--src/debug/debug_new.h6
-rw-r--r--src/debug/fast_mutex.h6
-rw-r--r--src/graphics.cpp2
-rw-r--r--src/graphics.h4
-rw-r--r--src/gui/botcheckerwindow.cpp2
-rw-r--r--src/gui/botcheckerwindow.h4
-rw-r--r--src/gui/buydialog.cpp2
-rw-r--r--src/gui/buydialog.h4
-rw-r--r--src/gui/chatwindow.cpp4
-rw-r--r--src/gui/chatwindow.h4
-rw-r--r--src/gui/didyouknowwindow.cpp4
-rw-r--r--src/gui/didyouknowwindow.h6
-rw-r--r--src/gui/equipmentwindow.cpp2
-rw-r--r--src/gui/equipmentwindow.h4
-rw-r--r--src/gui/helpwindow.cpp2
-rw-r--r--src/gui/helpwindow.h6
-rw-r--r--src/gui/inventorywindow.cpp4
-rw-r--r--src/gui/inventorywindow.h4
-rw-r--r--src/gui/itemamountwindow.cpp4
-rw-r--r--src/gui/itemamountwindow.h4
-rw-r--r--src/gui/killstats.cpp2
-rw-r--r--src/gui/killstats.h2
-rw-r--r--src/gui/ministatus.cpp2
-rw-r--r--src/gui/ministatus.h4
-rw-r--r--src/gui/popupmenu.cpp2
-rw-r--r--src/gui/popupmenu.h6
-rw-r--r--src/gui/register.cpp2
-rw-r--r--src/gui/register.h4
-rw-r--r--src/gui/selldialog.cpp2
-rw-r--r--src/gui/selldialog.h4
-rw-r--r--src/gui/setup_colors.cpp2
-rw-r--r--src/gui/setup_colors.h4
-rw-r--r--src/gui/setup_players.cpp2
-rw-r--r--src/gui/setup_players.h4
-rw-r--r--src/gui/setupitem.cpp10
-rw-r--r--src/gui/setupitem.h4
-rw-r--r--src/gui/shopwindow.cpp2
-rw-r--r--src/gui/shopwindow.h4
-rw-r--r--src/gui/skilldialog.cpp2
-rw-r--r--src/gui/skilldialog.h4
-rw-r--r--src/gui/socialwindow.cpp16
-rw-r--r--src/gui/socialwindow.h4
-rw-r--r--src/gui/specialswindow.h4
-rw-r--r--src/gui/statuswindow.cpp6
-rw-r--r--src/gui/statuswindow.h4
-rw-r--r--src/gui/updatewindow.h4
-rw-r--r--src/gui/viewport.cpp6
-rw-r--r--src/gui/viewport.h4
-rw-r--r--src/gui/whoisonline.h4
-rw-r--r--src/gui/widgets/button.cpp4
-rw-r--r--src/gui/widgets/chattab.h8
-rw-r--r--src/gui/widgets/checkbox.cpp4
-rw-r--r--src/gui/widgets/checkbox.h4
-rw-r--r--src/gui/widgets/desktop.cpp2
-rw-r--r--src/gui/widgets/desktop.h4
-rw-r--r--src/gui/widgets/dropshortcutcontainer.cpp2
-rw-r--r--src/gui/widgets/dropshortcutcontainer.h4
-rw-r--r--src/gui/widgets/emoteshortcutcontainer.cpp2
-rw-r--r--src/gui/widgets/flowcontainer.cpp2
-rw-r--r--src/gui/widgets/flowcontainer.h4
-rw-r--r--src/gui/widgets/horizontcontainer.cpp2
-rw-r--r--src/gui/widgets/horizontcontainer.h4
-rw-r--r--src/gui/widgets/inventoryfilter.h4
-rw-r--r--src/gui/widgets/itemcontainer.cpp8
-rw-r--r--src/gui/widgets/itemcontainer.h4
-rw-r--r--src/gui/widgets/itemlinkhandler.cpp2
-rw-r--r--src/gui/widgets/itemlinkhandler.h6
-rw-r--r--src/gui/widgets/itemshortcutcontainer.cpp2
-rw-r--r--src/gui/widgets/itemshortcutcontainer.h4
-rw-r--r--src/gui/widgets/layouthelper.cpp2
-rw-r--r--src/gui/widgets/layouthelper.h4
-rw-r--r--src/gui/widgets/listbox.cpp4
-rw-r--r--src/gui/widgets/listbox.h4
-rw-r--r--src/gui/widgets/popup.cpp6
-rw-r--r--src/gui/widgets/popup.h4
-rw-r--r--src/gui/widgets/progressbar.cpp4
-rw-r--r--src/gui/widgets/radiobutton.cpp4
-rw-r--r--src/gui/widgets/radiobutton.h4
-rw-r--r--src/gui/widgets/scrollarea.cpp10
-rw-r--r--src/gui/widgets/scrollarea.h4
-rw-r--r--src/gui/widgets/setuptabscroll.h6
-rw-r--r--src/gui/widgets/shoplistbox.cpp2
-rw-r--r--src/gui/widgets/shoplistbox.h6
-rw-r--r--src/gui/widgets/shortcutcontainer.cpp2
-rw-r--r--src/gui/widgets/shortcutcontainer.h4
-rw-r--r--src/gui/widgets/slider.cpp4
-rw-r--r--src/gui/widgets/slider.h4
-rw-r--r--src/gui/widgets/spellshortcutcontainer.cpp2
-rw-r--r--src/gui/widgets/spellshortcutcontainer.h4
-rw-r--r--src/gui/widgets/tab.cpp4
-rw-r--r--src/gui/widgets/tabbedarea.cpp2
-rw-r--r--src/gui/widgets/tabbedarea.h4
-rw-r--r--src/gui/widgets/table.cpp2
-rw-r--r--src/gui/widgets/table.h4
-rw-r--r--src/gui/widgets/vertcontainer.cpp2
-rw-r--r--src/gui/widgets/vertcontainer.h4
-rw-r--r--src/gui/widgets/window.cpp10
-rw-r--r--src/gui/widgets/window.h4
-rw-r--r--src/gui/windowmenu.cpp2
-rw-r--r--src/gui/windowmenu.h6
-rw-r--r--src/guichan/defaultfont.cpp2
-rw-r--r--src/guichan/include/guichan/defaultfont.hpp4
-rw-r--r--src/guichan/include/guichan/focuslistener.hpp8
-rw-r--r--src/guichan/include/guichan/keylistener.hpp8
-rw-r--r--src/guichan/include/guichan/mouselistener.hpp22
-rw-r--r--src/guichan/include/guichan/selectionlistener.hpp6
-rw-r--r--src/guichan/include/guichan/widget.hpp12
-rw-r--r--src/guichan/include/guichan/widgetlistener.hpp12
-rw-r--r--src/guichan/include/guichan/widgets/button.hpp4
-rw-r--r--src/guichan/include/guichan/widgets/dropdown.hpp4
-rw-r--r--src/guichan/include/guichan/widgets/tab.hpp4
-rw-r--r--src/guichan/include/guichan/widgets/window.hpp4
-rw-r--r--src/guichan/widget.cpp2
-rw-r--r--src/guichan/widgets/button.cpp6
-rw-r--r--src/guichan/widgets/dropdown.cpp6
-rw-r--r--src/guichan/widgets/tab.cpp4
-rw-r--r--src/guichan/widgets/window.cpp2
-rw-r--r--src/imagesprite.h10
-rw-r--r--src/localplayer.cpp2
-rw-r--r--src/localplayer.h4
-rw-r--r--src/log.h4
-rw-r--r--src/main.cpp2
-rw-r--r--src/main.h4
-rw-r--r--src/map.h4
-rw-r--r--src/net/download.cpp2
-rw-r--r--src/net/download.h4
-rw-r--r--src/net/ea/adminhandler.cpp8
-rw-r--r--src/net/ea/adminhandler.h4
-rw-r--r--src/net/ea/beinghandler.cpp2
-rw-r--r--src/net/ea/beinghandler.h4
-rw-r--r--src/net/manaserv/adminhandler.cpp20
-rw-r--r--src/net/manaserv/adminhandler.h4
-rw-r--r--src/net/manaserv/beinghandler.cpp4
-rw-r--r--src/net/manaserv/beinghandler.h4
-rw-r--r--src/net/manaserv/buysellhandler.cpp16
-rw-r--r--src/net/manaserv/buysellhandler.h4
-rw-r--r--src/net/manaserv/chathandler.cpp4
-rw-r--r--src/net/manaserv/chathandler.h4
-rw-r--r--src/net/manaserv/gamehandler.cpp2
-rw-r--r--src/net/manaserv/gamehandler.h4
-rw-r--r--src/net/manaserv/generalhandler.h4
-rw-r--r--src/net/manaserv/guildhandler.cpp32
-rw-r--r--src/net/manaserv/guildhandler.h6
-rw-r--r--src/net/manaserv/inventoryhandler.cpp8
-rw-r--r--src/net/manaserv/inventoryhandler.h4
-rw-r--r--src/net/manaserv/loginhandler.cpp2
-rw-r--r--src/net/manaserv/loginhandler.h4
-rw-r--r--src/net/manaserv/npchandler.cpp16
-rw-r--r--src/net/manaserv/npchandler.h4
-rw-r--r--src/net/manaserv/partyhandler.cpp10
-rw-r--r--src/net/manaserv/partyhandler.h8
-rw-r--r--src/net/manaserv/playerhandler.cpp14
-rw-r--r--src/net/manaserv/playerhandler.h4
-rw-r--r--src/net/manaserv/specialhandler.cpp12
-rw-r--r--src/net/manaserv/specialhandler.h4
-rw-r--r--src/net/manaserv/tradehandler.cpp2
-rw-r--r--src/net/manaserv/tradehandler.h4
-rw-r--r--src/net/messageout.cpp2
-rw-r--r--src/net/messageout.h4
-rw-r--r--src/net/tmwa/adminhandler.cpp2
-rw-r--r--src/net/tmwa/adminhandler.h4
-rw-r--r--src/net/tmwa/charserverhandler.cpp2
-rw-r--r--src/net/tmwa/charserverhandler.h4
-rw-r--r--src/net/tmwa/chathandler.cpp26
-rw-r--r--src/net/tmwa/chathandler.h4
-rw-r--r--src/net/tmwa/gamehandler.h4
-rw-r--r--src/net/tmwa/generalhandler.h4
-rw-r--r--src/net/tmwa/guildhandler.cpp24
-rw-r--r--src/net/tmwa/guildhandler.h6
-rw-r--r--src/net/tmwa/inventoryhandler.cpp12
-rw-r--r--src/net/tmwa/inventoryhandler.h4
-rw-r--r--src/net/tmwa/loginhandler.cpp8
-rw-r--r--src/net/tmwa/loginhandler.h4
-rw-r--r--src/net/tmwa/npchandler.cpp14
-rw-r--r--src/net/tmwa/npchandler.h4
-rw-r--r--src/net/tmwa/partyhandler.cpp4
-rw-r--r--src/net/tmwa/partyhandler.h4
-rw-r--r--src/net/tmwa/playerhandler.cpp12
-rw-r--r--src/net/tmwa/playerhandler.h4
-rw-r--r--src/net/tmwa/specialhandler.cpp2
-rw-r--r--src/net/tmwa/specialhandler.h4
-rw-r--r--src/net/tmwa/tradehandler.cpp2
-rw-r--r--src/net/tmwa/tradehandler.h4
-rw-r--r--src/net/tradehandler.h14
-rw-r--r--src/opengl1graphics.cpp18
-rw-r--r--src/opengl1graphics.h4
-rw-r--r--src/openglgraphics.cpp2
-rw-r--r--src/openglgraphics.h4
-rw-r--r--src/particle.h6
-rw-r--r--src/playerrelations.cpp8
-rw-r--r--src/playerrelations.h4
-rw-r--r--src/resources/itemdb.h4
-rw-r--r--src/resources/mapreader.h4
-rw-r--r--src/shopitem.h4
-rw-r--r--src/textmanager.cpp2
-rw-r--r--src/textmanager.h4
-rw-r--r--src/utils/mkdir.cpp8
-rw-r--r--src/utils/mkdir.h4
-rw-r--r--src/utils/specialfolder.cpp4
-rw-r--r--src/utils/specialfolder.h4
208 files changed, 605 insertions, 605 deletions
diff --git a/src/actorspritemanager.h b/src/actorspritemanager.h
index f9414e010..91503e1c3 100644
--- a/src/actorspritemanager.h
+++ b/src/actorspritemanager.h
@@ -31,9 +31,9 @@
#include <vector>
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
class LocalPlayer;
diff --git a/src/being.cpp b/src/being.cpp
index c65b1c517..fcf230dc0 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -669,7 +669,7 @@ void Being::takeDamage(Being *attacker, int amount, AttackType type)
}
void Being::handleAttack(Being *victim, int damage,
- AttackType type _UNUSED_)
+ AttackType type A_UNUSED)
{
if (!victim || !mInfo)
return;
@@ -741,7 +741,7 @@ void Being::setGuildName(const std::string &name)
}
-void Being::setGuildPos(const std::string &pos _UNUSED_)
+void Being::setGuildPos(const std::string &pos A_UNUSED)
{
// logger->log("Got guild position \"%s\" for being %s(%i)", pos.c_str(), mName.c_str(), mId);
}
@@ -915,7 +915,7 @@ void Being::fireMissile(Being *victim, const std::string &particle)
}
-void Being::setAction(Action action, int attackType _UNUSED_)
+void Being::setAction(Action action, int attackType A_UNUSED)
{
std::string currentAction = SpriteAction::INVALID;
diff --git a/src/being.h b/src/being.h
index 54d922279..de50d8fcf 100644
--- a/src/being.h
+++ b/src/being.h
@@ -24,9 +24,9 @@
#define BEING_H
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
#include "actorsprite.h"
diff --git a/src/chatlog.h b/src/chatlog.h
index b0c5d0168..c3e8b2e27 100644
--- a/src/chatlog.h
+++ b/src/chatlog.h
@@ -21,8 +21,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef _CHATLOG_H
-#define _CHATLOG_H
+#ifndef M_CHATLOG_H
+#define M_CHATLOG_H
#include <fstream>
#include <list>
diff --git a/src/client.cpp b/src/client.cpp
index 7d8ae90b6..f20c08c30 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -144,8 +144,8 @@ Graphics *graphics;
Sound sound;
-Uint32 nextTick(Uint32 interval, void *param _UNUSED_);
-Uint32 nextSecond(Uint32 interval, void *param _UNUSED_);
+Uint32 nextTick(Uint32 interval, void *param A_UNUSED);
+Uint32 nextSecond(Uint32 interval, void *param A_UNUSED);
void ErrorListener::action(const gcn::ActionEvent &)
{
@@ -168,7 +168,7 @@ int textures_count = 0;
* Called every 10 milliseconds by SDL_AddTimer()
* @see MILLISECONDS_IN_A_TICK value
*/
-Uint32 nextTick(Uint32 interval, void *param _UNUSED_)
+Uint32 nextTick(Uint32 interval, void *param A_UNUSED)
{
tick_time++;
if (tick_time == MAX_TICK_VALUE)
@@ -180,7 +180,7 @@ Uint32 nextTick(Uint32 interval, void *param _UNUSED_)
* Updates fps.
* Called every seconds by SDL_AddTimer()
*/
-Uint32 nextSecond(Uint32 interval, void *param _UNUSED_)
+Uint32 nextSecond(Uint32 interval, void *param A_UNUSED)
{
fps = frame_count;
frame_count = 0;
diff --git a/src/client.h b/src/client.h
index dc94bdd93..75b3c03fe 100644
--- a/src/client.h
+++ b/src/client.h
@@ -37,9 +37,9 @@
#include <sys/time.h>
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
class Button;
diff --git a/src/commandhandler.cpp b/src/commandhandler.cpp
index 276cd741a..b87dcf583 100644
--- a/src/commandhandler.cpp
+++ b/src/commandhandler.cpp
@@ -319,13 +319,13 @@ char CommandHandler::parseBoolean(const std::string &value)
}
void CommandHandler::handleAnnounce(const std::string &args,
- ChatTab *tab _UNUSED_)
+ ChatTab *tab A_UNUSED)
{
Net::getAdminHandler()->announce(args);
}
-void CommandHandler::handleHelp(const std::string &args _UNUSED_,
- ChatTab *tab _UNUSED_)
+void CommandHandler::handleHelp(const std::string &args A_UNUSED,
+ ChatTab *tab A_UNUSED)
{
if (helpWindow)
{
@@ -334,7 +334,7 @@ void CommandHandler::handleHelp(const std::string &args _UNUSED_,
}
}
-void CommandHandler::handleWhere(const std::string &args _UNUSED_,
+void CommandHandler::handleWhere(const std::string &args A_UNUSED,
ChatTab *tab)
{
std::ostringstream where;
@@ -345,8 +345,8 @@ void CommandHandler::handleWhere(const std::string &args _UNUSED_,
tab->chatLog(where.str(), BY_SERVER);
}
-void CommandHandler::handleWho(const std::string &args _UNUSED_,
- ChatTab *tab _UNUSED_)
+void CommandHandler::handleWho(const std::string &args A_UNUSED,
+ ChatTab *tab A_UNUSED)
{
Net::getChatHandler()->who();
}
@@ -411,8 +411,8 @@ void CommandHandler::handleQuery(const std::string &args, ChatTab *tab)
args.c_str()), BY_SERVER);
}
-void CommandHandler::handleClear(const std::string &args _UNUSED_,
- ChatTab *tab _UNUSED_)
+void CommandHandler::handleClear(const std::string &args A_UNUSED,
+ ChatTab *tab A_UNUSED)
{
if (chatWindow)
chatWindow->clearTab();
@@ -430,8 +430,8 @@ void CommandHandler::handleJoin(const std::string &args, ChatTab *tab)
Net::getChatHandler()->enterChannel(name, password);
}
-void CommandHandler::handleListChannels(const std::string &args _UNUSED_,
- ChatTab *tab _UNUSED_)
+void CommandHandler::handleListChannels(const std::string &args A_UNUSED,
+ ChatTab *tab A_UNUSED)
{
Net::getChatHandler()->channelList();
}
@@ -537,15 +537,15 @@ void CommandHandler::handleToggle(const std::string &args, ChatTab *tab)
}
}
-void CommandHandler::handlePresent(const std::string &args _UNUSED_,
- ChatTab *tab _UNUSED_)
+void CommandHandler::handlePresent(const std::string &args A_UNUSED,
+ ChatTab *tab A_UNUSED)
{
if (chatWindow)
chatWindow->doPresent();
}
void CommandHandler::handleIgnore(const std::string &args,
- ChatTab *tab _UNUSED_)
+ ChatTab *tab A_UNUSED)
{
changeRelation(args, PlayerRelation::IGNORED, "ignored", tab);
}
@@ -668,20 +668,20 @@ void CommandHandler::handleErase(const std::string &args, ChatTab *tab)
}
}
-void CommandHandler::handleQuit(const std::string &args _UNUSED_,
- ChatTab *tab _UNUSED_)
+void CommandHandler::handleQuit(const std::string &args A_UNUSED,
+ ChatTab *tab A_UNUSED)
{
// quit();
}
-void CommandHandler::handleShowAll(const std::string &args _UNUSED_,
- ChatTab *tab _UNUSED_)
+void CommandHandler::handleShowAll(const std::string &args A_UNUSED,
+ ChatTab *tab A_UNUSED)
{
if (actorSpriteManager)
actorSpriteManager->printAllToChat();
}
-void CommandHandler::handleMove(const std::string &args, ChatTab *tab _UNUSED_)
+void CommandHandler::handleMove(const std::string &args, ChatTab *tab A_UNUSED)
{
int x = 0;
int y = 0;
@@ -691,7 +691,7 @@ void CommandHandler::handleMove(const std::string &args, ChatTab *tab _UNUSED_)
}
void CommandHandler::handleNavigate(const std::string &args,
- ChatTab *tab _UNUSED_)
+ ChatTab *tab A_UNUSED)
{
if (!player_node)
return;
@@ -722,7 +722,7 @@ bool CommandHandler::parse2Int(const std::string &args, int *x, int *y)
}
void CommandHandler::handleTarget(const std::string &args,
- ChatTab *tab _UNUSED_)
+ ChatTab *tab A_UNUSED)
{
if (!actorSpriteManager || !player_node)
return;
@@ -732,22 +732,22 @@ void CommandHandler::handleTarget(const std::string &args,
player_node->setTarget(target);
}
-void CommandHandler::handleCloseAll(const std::string &args _UNUSED_,
- ChatTab *tab _UNUSED_)
+void CommandHandler::handleCloseAll(const std::string &args A_UNUSED,
+ ChatTab *tab A_UNUSED)
{
if (chatWindow)
chatWindow->removeAllWhispers();
}
-void CommandHandler::handleIgnoreAll(const std::string &args _UNUSED_,
- ChatTab *tab _UNUSED_)
+void CommandHandler::handleIgnoreAll(const std::string &args A_UNUSED,
+ ChatTab *tab A_UNUSED)
{
if (chatWindow)
chatWindow->ignoreAllWhispers();
}
void CommandHandler::handleOutfit(const std::string &args,
- ChatTab *tab _UNUSED_)
+ ChatTab *tab A_UNUSED)
{
if (outfitWindow)
{
@@ -769,13 +769,13 @@ void CommandHandler::handleOutfit(const std::string &args,
}
void CommandHandler::handleEmote(const std::string &args,
- ChatTab *tab _UNUSED_)
+ ChatTab *tab A_UNUSED)
{
if (player_node)
player_node->emote(static_cast<Uint8>(atoi(args.c_str())));
}
-void CommandHandler::handleAway(const std::string &args, ChatTab *tab _UNUSED_)
+void CommandHandler::handleAway(const std::string &args, ChatTab *tab A_UNUSED)
{
if (player_node)
player_node->setAway(args);
@@ -822,7 +822,7 @@ void CommandHandler::handleImitation(const std::string &args, ChatTab *tab)
}
}
-void CommandHandler::handleHeal(const std::string &args, ChatTab *tab _UNUSED_)
+void CommandHandler::handleHeal(const std::string &args, ChatTab *tab A_UNUSED)
{
if (!actorSpriteManager)
return;
@@ -840,38 +840,38 @@ void CommandHandler::handleHeal(const std::string &args, ChatTab *tab _UNUSED_)
}
}
-void CommandHandler::handleHack(const std::string &args, ChatTab *tab _UNUSED_)
+void CommandHandler::handleHack(const std::string &args, ChatTab *tab A_UNUSED)
{
Net::getChatHandler()->sendRaw(args);
}
-void CommandHandler::handleMail(const std::string &args, ChatTab *tab _UNUSED_)
+void CommandHandler::handleMail(const std::string &args, ChatTab *tab A_UNUSED)
{
Net::getChatHandler()->privateMessage("AuctionBot", "!mail " + args);
}
-void CommandHandler::handlePriceLoad(const std::string &args _UNUSED_,
- ChatTab *tab _UNUSED_)
+void CommandHandler::handlePriceLoad(const std::string &args A_UNUSED,
+ ChatTab *tab A_UNUSED)
{
if (shopWindow)
shopWindow->loadList();
}
-void CommandHandler::handlePriceSave(const std::string &args _UNUSED_,
- ChatTab *tab _UNUSED_)
+void CommandHandler::handlePriceSave(const std::string &args A_UNUSED,
+ ChatTab *tab A_UNUSED)
{
if (shopWindow)
shopWindow->saveList();
}
-void CommandHandler::handleDisconnect(const std::string &args _UNUSED_,
- ChatTab *tab _UNUSED_)
+void CommandHandler::handleDisconnect(const std::string &args A_UNUSED,
+ ChatTab *tab A_UNUSED)
{
Net::getGameHandler()->disconnect2();
}
void CommandHandler::handleUndress(const std::string &args,
- ChatTab *tab _UNUSED_)
+ ChatTab *tab A_UNUSED)
{
if (!actorSpriteManager)
return;
@@ -882,7 +882,7 @@ void CommandHandler::handleUndress(const std::string &args,
}
void CommandHandler::handleAttack(const std::string &args,
- ChatTab *tab _UNUSED_)
+ ChatTab *tab A_UNUSED)
{
if (!player_node || !actorSpriteManager)
return;
@@ -894,7 +894,7 @@ void CommandHandler::handleAttack(const std::string &args,
}
void CommandHandler::handleTrade(const std::string &args,
- ChatTab *tab _UNUSED_)
+ ChatTab *tab A_UNUSED)
{
if (!actorSpriteManager)
return;
@@ -909,8 +909,8 @@ void CommandHandler::handleTrade(const std::string &args,
}
}
-void CommandHandler::handleDirs(const std::string &args _UNUSED_,
- ChatTab *tab _UNUSED_)
+void CommandHandler::handleDirs(const std::string &args A_UNUSED,
+ ChatTab *tab A_UNUSED)
{
if (!player_node || !debugChatTab)
return;
@@ -923,7 +923,7 @@ void CommandHandler::handleDirs(const std::string &args _UNUSED_,
+ Client::getScreenshotDirectory());
}
-void CommandHandler::handleInfo(const std::string &args _UNUSED_,
+void CommandHandler::handleInfo(const std::string &args A_UNUSED,
ChatTab *tab)
{
switch (tab->getType())
@@ -943,14 +943,14 @@ void CommandHandler::handleInfo(const std::string &args _UNUSED_,
}
void CommandHandler::handleWait(const std::string &args,
- ChatTab *tab _UNUSED_)
+ ChatTab *tab A_UNUSED)
{
if (player_node)
player_node->waitFor(args);
}
-void CommandHandler::handleUptime(const std::string &args _UNUSED_,
- ChatTab *tab _UNUSED_)
+void CommandHandler::handleUptime(const std::string &args A_UNUSED,
+ ChatTab *tab A_UNUSED)
{
if (!debugChatTab)
return;
@@ -1008,7 +1008,7 @@ void CommandHandler::handleUptime(const std::string &args _UNUSED_,
}
void CommandHandler::handleAddPriorityAttack(const std::string &args,
- ChatTab *tab _UNUSED_)
+ ChatTab *tab A_UNUSED)
{
if (!actorSpriteManager
|| actorSpriteManager->isInPriorityAttackList(args))
@@ -1024,7 +1024,7 @@ void CommandHandler::handleAddPriorityAttack(const std::string &args,
}
void CommandHandler::handleAddAttack(const std::string &args,
- ChatTab *tab _UNUSED_)
+ ChatTab *tab A_UNUSED)
{
if (!actorSpriteManager || actorSpriteManager->isInAttackList(args))
return;
@@ -1037,7 +1037,7 @@ void CommandHandler::handleAddAttack(const std::string &args,
}
void CommandHandler::handleRemoveAttack(const std::string &args,
- ChatTab *tab _UNUSED_)
+ ChatTab *tab A_UNUSED)
{
if (!actorSpriteManager || args.empty()
|| !actorSpriteManager->isInAttackList(args))
@@ -1052,7 +1052,7 @@ void CommandHandler::handleRemoveAttack(const std::string &args,
}
void CommandHandler::handleAddIgnoreAttack(const std::string &args,
- ChatTab *tab _UNUSED_)
+ ChatTab *tab A_UNUSED)
{
if (!actorSpriteManager || actorSpriteManager->isInIgnoreAttackList(args))
return;
@@ -1064,8 +1064,8 @@ void CommandHandler::handleAddIgnoreAttack(const std::string &args,
socialWindow->updateAttackFilter();
}
-void CommandHandler::handleCacheInfo(const std::string &args _UNUSED_,
- ChatTab *tab _UNUSED_)
+void CommandHandler::handleCacheInfo(const std::string &args A_UNUSED,
+ ChatTab *tab A_UNUSED)
{
if (!chatWindow || !debugChatTab)
return;
@@ -1134,7 +1134,7 @@ void showRes(std::string str, ResourceManager::Resources *res)
}
void CommandHandler::handleDump(const std::string &args,
- ChatTab *tab _UNUSED_)
+ ChatTab *tab A_UNUSED)
{
if (!debugChatTab)
return;
@@ -1158,14 +1158,14 @@ void CommandHandler::handleDump(const std::string &args,
}
}
#elif defined ENABLE_MEM_DEBUG
-void CommandHandler::handleDump(const std::string &args _UNUSED_,
- ChatTab *tab _UNUSED_)
+void CommandHandler::handleDump(const std::string &args A_UNUSED,
+ ChatTab *tab A_UNUSED)
{
check_leaks();
}
#else
-void CommandHandler::handleDump(const std::string &args _UNUSED_,
- ChatTab *tab _UNUSED_)
+void CommandHandler::handleDump(const std::string &args A_UNUSED,
+ ChatTab *tab A_UNUSED)
{
}
#endif
diff --git a/src/commandhandler.h b/src/commandhandler.h
index f58e86b21..64f0288c3 100644
--- a/src/commandhandler.h
+++ b/src/commandhandler.h
@@ -32,9 +32,9 @@ class ChatTab;
extern ChatTab *localChatTab;
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
#define BOOLEAN_OPTIONS _("Options to /%s are \"yes\", \"no\", \"true\", "\
@@ -248,23 +248,23 @@ class CommandHandler
*/
void handleNavigate(const std::string &args, ChatTab *tab);
- void handleMail(const std::string &args, ChatTab *tab _UNUSED_);
+ void handleMail(const std::string &args, ChatTab *tab A_UNUSED);
void handleHack(const std::string &args, ChatTab *tab);
- void handlePriceLoad(const std::string &args _UNUSED_,
- ChatTab *tab _UNUSED_);
+ void handlePriceLoad(const std::string &args A_UNUSED,
+ ChatTab *tab A_UNUSED);
- void handlePriceSave(const std::string &args _UNUSED_,
- ChatTab *tab _UNUSED_);
+ void handlePriceSave(const std::string &args A_UNUSED,
+ ChatTab *tab A_UNUSED);
- void handleTrade(const std::string &args, ChatTab *tab _UNUSED_);
+ void handleTrade(const std::string &args, ChatTab *tab A_UNUSED);
- void handleDisconnect(const std::string &args, ChatTab *tab _UNUSED_);
+ void handleDisconnect(const std::string &args, ChatTab *tab A_UNUSED);
- void handleUndress(const std::string &args, ChatTab *tab _UNUSED_);
+ void handleUndress(const std::string &args, ChatTab *tab A_UNUSED);
- void handleAttack(const std::string &args, ChatTab *tab _UNUSED_);
+ void handleAttack(const std::string &args, ChatTab *tab A_UNUSED);
void handleDirs(const std::string &args, ChatTab *tab);
@@ -274,20 +274,20 @@ class CommandHandler
void handleUptime(const std::string &args, ChatTab *tab);
- void handleAddAttack(const std::string &args, ChatTab *tab _UNUSED_);
+ void handleAddAttack(const std::string &args, ChatTab *tab A_UNUSED);
void handleAddPriorityAttack(const std::string &args,
- ChatTab *tab _UNUSED_);
+ ChatTab *tab A_UNUSED);
void handleRemoveAttack(const std::string &args,
- ChatTab *tab _UNUSED_);
+ ChatTab *tab A_UNUSED);
void handleAddIgnoreAttack(const std::string &args,
- ChatTab *tab _UNUSED_);
+ ChatTab *tab A_UNUSED);
void handleDump(const std::string &args, ChatTab *tab);
- void handleCacheInfo(const std::string &args, ChatTab *tab _UNUSED_);
+ void handleCacheInfo(const std::string &args, ChatTab *tab A_UNUSED);
bool parse2Int(const std::string &args, int *x, int *y);
};
diff --git a/src/debug/debug_new.h b/src/debug/debug_new.h
index 986092c2f..0e99b96a7 100644
--- a/src/debug/debug_new.h
+++ b/src/debug/debug_new.h
@@ -39,8 +39,8 @@
*
*/
-#ifndef _DEBUG_NEW_H
-#define _DEBUG_NEW_H
+#ifndef M_DEBUG_NEW_H
+#define M_DEBUG_NEW_H
#include <new>
#include <stdio.h>
@@ -180,4 +180,4 @@ public:
/** Counting object for each file including debug_new.h. */
static __debug_new_counter __debug_new_count;
-#endif // _DEBUG_NEW_H
+#endif // M_DEBUG_NEW_H
diff --git a/src/debug/fast_mutex.h b/src/debug/fast_mutex.h
index a6adb2db3..60ad1f305 100644
--- a/src/debug/fast_mutex.h
+++ b/src/debug/fast_mutex.h
@@ -39,8 +39,8 @@
*
*/
-#ifndef _FAST_MUTEX_H
-#define _FAST_MUTEX_H
+#ifndef M_FAST_MUTEX_H
+#define M_FAST_MUTEX_H
# if !defined(_NOTHREADS)
# if !defined(_WIN32THREADS) && \
@@ -311,4 +311,4 @@ private:
fast_mutex_autolock& operator=(const fast_mutex_autolock&);
};
-#endif // _FAST_MUTEX_H
+#endif // M_FAST_MUTEX_H
diff --git a/src/graphics.cpp b/src/graphics.cpp
index ee848a673..4914d22ce 100644
--- a/src/graphics.cpp
+++ b/src/graphics.cpp
@@ -150,7 +150,7 @@ bool Graphics::drawRescaledImage(Image *image, int srcX, int srcY,
int dstX, int dstY,
int width, int height,
int desiredWidth, int desiredHeight,
- bool useColor _UNUSED_)
+ bool useColor A_UNUSED)
{
// Check that preconditions for blitting are met.
if (!mTarget || !image)
diff --git a/src/graphics.h b/src/graphics.h
index a6e2941d2..ca5de63a9 100644
--- a/src/graphics.h
+++ b/src/graphics.h
@@ -28,9 +28,9 @@
//include "graphicsvertexes.h"
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
class GraphicsVertexes;
diff --git a/src/gui/botcheckerwindow.cpp b/src/gui/botcheckerwindow.cpp
index a15a7ed56..ac845adc1 100644
--- a/src/gui/botcheckerwindow.cpp
+++ b/src/gui/botcheckerwindow.cpp
@@ -234,7 +234,7 @@ public:
signalAfterUpdate();
}
- virtual void updateModelInRow(int row _UNUSED_)
+ virtual void updateModelInRow(int row A_UNUSED)
{
}
diff --git a/src/gui/botcheckerwindow.h b/src/gui/botcheckerwindow.h
index cb225d3e7..e378fffb0 100644
--- a/src/gui/botcheckerwindow.h
+++ b/src/gui/botcheckerwindow.h
@@ -32,9 +32,9 @@
#include <vector>
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
struct BOTCHK
diff --git a/src/gui/buydialog.cpp b/src/gui/buydialog.cpp
index 530c4020b..04dd425c1 100644
--- a/src/gui/buydialog.cpp
+++ b/src/gui/buydialog.cpp
@@ -247,7 +247,7 @@ void BuyDialog::action(const gcn::ActionEvent &event)
}
}
-void BuyDialog::valueChanged(const gcn::SelectionEvent &event _UNUSED_)
+void BuyDialog::valueChanged(const gcn::SelectionEvent &event A_UNUSED)
{
// Reset amount of items and update labels
mAmountItems = 1;
diff --git a/src/gui/buydialog.h b/src/gui/buydialog.h
index eabf26ef8..0ba2e5cb3 100644
--- a/src/gui/buydialog.h
+++ b/src/gui/buydialog.h
@@ -31,9 +31,9 @@
#include <guichan/selectionlistener.hpp>
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
class ShopItems;
diff --git a/src/gui/chatwindow.cpp b/src/gui/chatwindow.cpp
index 1ff375299..29ce3bace 100644
--- a/src/gui/chatwindow.cpp
+++ b/src/gui/chatwindow.cpp
@@ -87,7 +87,7 @@ class ChatInput : public TextField, public gcn::FocusListener
* Called if the chat input loses focus. It will set itself to
* invisible as result.
*/
- void focusLost(const gcn::Event &event _UNUSED_)
+ void focusLost(const gcn::Event &event A_UNUSED)
{
processVisible(false);
}
@@ -653,7 +653,7 @@ void ChatWindow::mouseDragged(gcn::MouseEvent &event)
}
/*
-void ChatWindow::mouseReleased(gcn::MouseEvent &event _UNUSED_)
+void ChatWindow::mouseReleased(gcn::MouseEvent &event A_UNUSED)
{
}
diff --git a/src/gui/chatwindow.h b/src/gui/chatwindow.h
index 0c43dcd8e..05e039c60 100644
--- a/src/gui/chatwindow.h
+++ b/src/gui/chatwindow.h
@@ -39,9 +39,9 @@
#include <set>
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
class BrowserBox;
diff --git a/src/gui/didyouknowwindow.cpp b/src/gui/didyouknowwindow.cpp
index b9f6edbf6..03188907f 100644
--- a/src/gui/didyouknowwindow.cpp
+++ b/src/gui/didyouknowwindow.cpp
@@ -101,8 +101,8 @@ void DidYouKnowWindow::action(const gcn::ActionEvent &event)
config.setValue("showDidYouKnow", mOpenAgainCheckBox->isSelected());
}
-void DidYouKnowWindow::handleLink(const std::string &link _UNUSED_,
- gcn::MouseEvent *event _UNUSED_)
+void DidYouKnowWindow::handleLink(const std::string &link A_UNUSED,
+ gcn::MouseEvent *event A_UNUSED)
{
}
diff --git a/src/gui/didyouknowwindow.h b/src/gui/didyouknowwindow.h
index 28a992d73..b135103e8 100644
--- a/src/gui/didyouknowwindow.h
+++ b/src/gui/didyouknowwindow.h
@@ -29,9 +29,9 @@
#include <guichan/actionlistener.hpp>
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
class Button;
@@ -60,7 +60,7 @@ class DidYouKnowWindow : public Window, public LinkHandler,
* Handles link action.
*/
void handleLink(const std::string &link,
- gcn::MouseEvent *event _UNUSED_);
+ gcn::MouseEvent *event A_UNUSED);
void loadData(int num = 0);
diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index 7cbcc658d..5a2820550 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.cpp
@@ -287,7 +287,7 @@ void EquipmentWindow::mouseMoved(gcn::MouseEvent &event)
}
// Hide ItemTooltip
-void EquipmentWindow::mouseExited(gcn::MouseEvent &event _UNUSED_)
+void EquipmentWindow::mouseExited(gcn::MouseEvent &event A_UNUSED)
{
if (mItemPopup)
mItemPopup->setVisible(false);
diff --git a/src/gui/equipmentwindow.h b/src/gui/equipmentwindow.h
index 75118707d..84353dfd2 100644
--- a/src/gui/equipmentwindow.h
+++ b/src/gui/equipmentwindow.h
@@ -31,9 +31,9 @@
#include <guichan/actionlistener.hpp>
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
class Being;
diff --git a/src/gui/helpwindow.cpp b/src/gui/helpwindow.cpp
index e0e42c0bb..ae0a432ea 100644
--- a/src/gui/helpwindow.cpp
+++ b/src/gui/helpwindow.cpp
@@ -82,7 +82,7 @@ void HelpWindow::action(const gcn::ActionEvent &event)
}
void HelpWindow::handleLink(const std::string &link,
- gcn::MouseEvent *event _UNUSED_)
+ gcn::MouseEvent *event A_UNUSED)
{
std::string helpFile = link;
loadHelp(helpFile);
diff --git a/src/gui/helpwindow.h b/src/gui/helpwindow.h
index df7a867d2..d59289db0 100644
--- a/src/gui/helpwindow.h
+++ b/src/gui/helpwindow.h
@@ -29,9 +29,9 @@
#include <guichan/actionlistener.hpp>
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
class BrowserBox;
@@ -58,7 +58,7 @@ class HelpWindow : public Window, public LinkHandler,
* Handles link action.
*/
void handleLink(const std::string &link,
- gcn::MouseEvent *event _UNUSED_);
+ gcn::MouseEvent *event A_UNUSED);
/**
* Loads help in the dialog.
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 132f9cb87..5e1accc09 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -438,7 +438,7 @@ void InventoryWindow::keyReleased(gcn::KeyEvent &event)
}
}
-void InventoryWindow::valueChanged(const gcn::SelectionEvent &event _UNUSED_)
+void InventoryWindow::valueChanged(const gcn::SelectionEvent &event A_UNUSED)
{
if (!mInventory || !mInventory->isMainInventory())
return;
@@ -531,7 +531,7 @@ void InventoryWindow::close()
}
}
-void InventoryWindow::event(Mana::Channels channel _UNUSED_,
+void InventoryWindow::event(Mana::Channels channel A_UNUSED,
const Mana::Event &event)
{
if (event.getName() == Mana::EVENT_UPDATEATTRIBUTE)
diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h
index 9ca45aaea..503423ad3 100644
--- a/src/gui/inventorywindow.h
+++ b/src/gui/inventorywindow.h
@@ -36,9 +36,9 @@
#include <guichan/selectionlistener.hpp>
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
class Item;
diff --git a/src/gui/itemamountwindow.cpp b/src/gui/itemamountwindow.cpp
index 908a861dd..a3f591634 100644
--- a/src/gui/itemamountwindow.cpp
+++ b/src/gui/itemamountwindow.cpp
@@ -310,7 +310,7 @@ void ItemAmountWindow::mouseMoved(gcn::MouseEvent &event)
}
// Hide ItemTooltip
-void ItemAmountWindow::mouseExited(gcn::MouseEvent &event _UNUSED_)
+void ItemAmountWindow::mouseExited(gcn::MouseEvent &event A_UNUSED)
{
if (mItemPopup)
mItemPopup->setVisible(false);
@@ -414,7 +414,7 @@ void ItemAmountWindow::close()
scheduleDelete();
}
-void ItemAmountWindow::keyReleased(gcn::KeyEvent &keyEvent _UNUSED_)
+void ItemAmountWindow::keyReleased(gcn::KeyEvent &keyEvent A_UNUSED)
{
mItemAmountSlide->setValue(mItemAmountTextField->getValue());
}
diff --git a/src/gui/itemamountwindow.h b/src/gui/itemamountwindow.h
index f51c074f7..2dffdc286 100644
--- a/src/gui/itemamountwindow.h
+++ b/src/gui/itemamountwindow.h
@@ -29,9 +29,9 @@
#include <guichan/actionlistener.hpp>
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
class Icon;
diff --git a/src/gui/killstats.cpp b/src/gui/killstats.cpp
index 962e6032c..95e16127a 100644
--- a/src/gui/killstats.cpp
+++ b/src/gui/killstats.cpp
@@ -434,7 +434,7 @@ void KillStats::validateJacko()
}
}
-void KillStats::event(Mana::Channels channel _UNUSED_,
+void KillStats::event(Mana::Channels channel A_UNUSED,
const Mana::Event &event)
{
if (event.getName() == Mana::EVENT_UPDATEATTRIBUTE)
diff --git a/src/gui/killstats.h b/src/gui/killstats.h
index 59b1ff653..3c7679ca9 100644
--- a/src/gui/killstats.h
+++ b/src/gui/killstats.h
@@ -77,7 +77,7 @@ class KillStats : public Window, gcn::ActionListener, public Mana::Listener
void addLog(std::string str);
- void event(Mana::Channels channel _UNUSED_,
+ void event(Mana::Channels channel A_UNUSED,
const Mana::Event &event);
private:
diff --git a/src/gui/ministatus.cpp b/src/gui/ministatus.cpp
index feaf5e0ca..817cd74a5 100644
--- a/src/gui/ministatus.cpp
+++ b/src/gui/ministatus.cpp
@@ -218,7 +218,7 @@ void MiniStatusWindow::drawIcons(Graphics *graphics)
}
}
-void MiniStatusWindow::event(Mana::Channels channel _UNUSED_,
+void MiniStatusWindow::event(Mana::Channels channel A_UNUSED,
const Mana::Event &event)
{
if (event.getName() == Mana::EVENT_UPDATEATTRIBUTE)
diff --git a/src/gui/ministatus.h b/src/gui/ministatus.h
index 0915ba8d4..f19055305 100644
--- a/src/gui/ministatus.h
+++ b/src/gui/ministatus.h
@@ -32,9 +32,9 @@
#include <vector>
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
class AnimatedSprite;
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index ad62f79a8..2739f13a9 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -773,7 +773,7 @@ void PopupMenu::showChangePos(int x, int y)
}
void PopupMenu::handleLink(const std::string &link,
- gcn::MouseEvent *event _UNUSED_)
+ gcn::MouseEvent *event A_UNUSED)
{
if (!actorSpriteManager)
return;
diff --git a/src/gui/popupmenu.h b/src/gui/popupmenu.h
index 8830bdd00..afa4bdfa2 100644
--- a/src/gui/popupmenu.h
+++ b/src/gui/popupmenu.h
@@ -29,9 +29,9 @@
#include <guichan/actionlistener.hpp>
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
class Being;
@@ -152,7 +152,7 @@ class PopupMenu : public Popup, public LinkHandler
* Handles link action.
*/
void handleLink(const std::string &link,
- gcn::MouseEvent *event _UNUSED_);
+ gcn::MouseEvent *event A_UNUSED);
private:
BrowserBox* mBrowserBox;
diff --git a/src/gui/register.cpp b/src/gui/register.cpp
index b7bbc4ab2..80ddb7469 100644
--- a/src/gui/register.cpp
+++ b/src/gui/register.cpp
@@ -247,7 +247,7 @@ void RegisterDialog::action(const gcn::ActionEvent &event)
}
}
-void RegisterDialog::keyPressed(gcn::KeyEvent &keyEvent _UNUSED_)
+void RegisterDialog::keyPressed(gcn::KeyEvent &keyEvent A_UNUSED)
{
mRegisterButton->setEnabled(canSubmit());
}
diff --git a/src/gui/register.h b/src/gui/register.h
index a44e51b2a..34bcadd6d 100644
--- a/src/gui/register.h
+++ b/src/gui/register.h
@@ -31,9 +31,9 @@
#include <string>
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
class LoginData;
diff --git a/src/gui/selldialog.cpp b/src/gui/selldialog.cpp
index fdbc53ea8..cf9bfb667 100644
--- a/src/gui/selldialog.cpp
+++ b/src/gui/selldialog.cpp
@@ -269,7 +269,7 @@ void SellDialog::action(const gcn::ActionEvent &event)
}
}
-void SellDialog::valueChanged(const gcn::SelectionEvent &event _UNUSED_)
+void SellDialog::valueChanged(const gcn::SelectionEvent &event A_UNUSED)
{
// Reset amount of items and update labels
mAmountItems = 1;
diff --git a/src/gui/selldialog.h b/src/gui/selldialog.h
index e40dd50c2..46cb077e1 100644
--- a/src/gui/selldialog.h
+++ b/src/gui/selldialog.h
@@ -31,9 +31,9 @@
#include <SDL_types.h>
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
class Item;
diff --git a/src/gui/setup_colors.cpp b/src/gui/setup_colors.cpp
index d11e996a5..7c0306f8f 100644
--- a/src/gui/setup_colors.cpp
+++ b/src/gui/setup_colors.cpp
@@ -236,7 +236,7 @@ void Setup_Colors::action(const gcn::ActionEvent &event)
}
}
-void Setup_Colors::valueChanged(const gcn::SelectionEvent &event _UNUSED_)
+void Setup_Colors::valueChanged(const gcn::SelectionEvent &event A_UNUSED)
{
if (!userPalette)
return;
diff --git a/src/gui/setup_colors.h b/src/gui/setup_colors.h
index d71c8fc5c..850f23897 100644
--- a/src/gui/setup_colors.h
+++ b/src/gui/setup_colors.h
@@ -32,9 +32,9 @@
#include <string>
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
class BrowserBox;
diff --git a/src/gui/setup_players.cpp b/src/gui/setup_players.cpp
index 453c2412c..407eca42a 100644
--- a/src/gui/setup_players.cpp
+++ b/src/gui/setup_players.cpp
@@ -528,7 +528,7 @@ void Setup_Players::action(const gcn::ActionEvent &event)
}
}
-void Setup_Players::updatedPlayer(const std::string &name _UNUSED_)
+void Setup_Players::updatedPlayer(const std::string &name A_UNUSED)
{
mPlayerTableModel->playerRelationsUpdated();
mDefaultTrading->setSelected(
diff --git a/src/gui/setup_players.h b/src/gui/setup_players.h
index a13218a36..83709d7bd 100644
--- a/src/gui/setup_players.h
+++ b/src/gui/setup_players.h
@@ -31,9 +31,9 @@
#include <guichan/actionlistener.hpp>
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
class EditDialog;
diff --git a/src/gui/setupitem.cpp b/src/gui/setupitem.cpp
index e4f112068..182501e72 100644
--- a/src/gui/setupitem.cpp
+++ b/src/gui/setupitem.cpp
@@ -145,18 +145,18 @@ void SetupItem::action()
fromWidget();
}
-void SetupItem::apply(std::string eventName _UNUSED_)
+void SetupItem::apply(std::string eventName A_UNUSED)
{
save();
}
-void SetupItem::cancel(std::string eventName _UNUSED_)
+void SetupItem::cancel(std::string eventName A_UNUSED)
{
load();
toWidget();
}
-void SetupItem::externalUpdated(std::string eventName _UNUSED_)
+void SetupItem::externalUpdated(std::string eventName A_UNUSED)
{
load();
toWidget();
@@ -498,10 +498,10 @@ void SetupItemLabel::toWidget()
{
}
-void SetupItemLabel::action(const gcn::ActionEvent &event _UNUSED_)
+void SetupItemLabel::action(const gcn::ActionEvent &event A_UNUSED)
{
}
-void SetupItemLabel::apply(std::string eventName _UNUSED_)
+void SetupItemLabel::apply(std::string eventName A_UNUSED)
{
}
diff --git a/src/gui/setupitem.h b/src/gui/setupitem.h
index 33fcbbf78..3396edea3 100644
--- a/src/gui/setupitem.h
+++ b/src/gui/setupitem.h
@@ -34,9 +34,9 @@
#include <list>
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
class CheckBox;
diff --git a/src/gui/shopwindow.cpp b/src/gui/shopwindow.cpp
index c6c41884d..68ea57314 100644
--- a/src/gui/shopwindow.cpp
+++ b/src/gui/shopwindow.cpp
@@ -255,7 +255,7 @@ void ShopWindow::startTrade()
mTradeNick = "";
}
-void ShopWindow::valueChanged(const gcn::SelectionEvent &event _UNUSED_)
+void ShopWindow::valueChanged(const gcn::SelectionEvent &event A_UNUSED)
{
updateButtonsAndLabels();
}
diff --git a/src/gui/shopwindow.h b/src/gui/shopwindow.h
index 0f122a876..bad4a0a4e 100644
--- a/src/gui/shopwindow.h
+++ b/src/gui/shopwindow.h
@@ -31,9 +31,9 @@
#include <guichan/selectionlistener.hpp>
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
class CheckBox;
diff --git a/src/gui/skilldialog.cpp b/src/gui/skilldialog.cpp
index b28bb7e36..5b47a5494 100644
--- a/src/gui/skilldialog.cpp
+++ b/src/gui/skilldialog.cpp
@@ -231,7 +231,7 @@ public:
skill->dispName);
}
- void mouseExited(gcn::MouseEvent &event _UNUSED_)
+ void mouseExited(gcn::MouseEvent &event A_UNUSED)
{
mPopup->hide();
}
diff --git a/src/gui/skilldialog.h b/src/gui/skilldialog.h
index 0b8287643..55dfafc38 100644
--- a/src/gui/skilldialog.h
+++ b/src/gui/skilldialog.h
@@ -43,9 +43,9 @@ class TabbedArea;
struct SkillInfo;
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
/**
diff --git a/src/gui/socialwindow.cpp b/src/gui/socialwindow.cpp
index fcb33542b..adcfe4d70 100644
--- a/src/gui/socialwindow.cpp
+++ b/src/gui/socialwindow.cpp
@@ -99,7 +99,7 @@ protected:
virtual void resetDamage(std::string name) = 0;
- virtual void selectIndex(unsigned num _UNUSED_)
+ virtual void selectIndex(unsigned num A_UNUSED)
{ }
TextDialog *mInviteDialog;
@@ -172,11 +172,11 @@ public:
{
}
- void updateAvatar(std::string name _UNUSED_)
+ void updateAvatar(std::string name A_UNUSED)
{
}
- void resetDamage(std::string name _UNUSED_)
+ void resetDamage(std::string name A_UNUSED)
{
}
@@ -269,11 +269,11 @@ public:
{
}
- void updateAvatar(std::string name _UNUSED_)
+ void updateAvatar(std::string name A_UNUSED)
{
}
- void resetDamage(std::string name _UNUSED_)
+ void resetDamage(std::string name A_UNUSED)
{
}
@@ -941,11 +941,11 @@ public:
}
- void updateAvatar(std::string name _UNUSED_)
+ void updateAvatar(std::string name A_UNUSED)
{
}
- void resetDamage(std::string name _UNUSED_)
+ void resetDamage(std::string name A_UNUSED)
{
}
@@ -978,7 +978,7 @@ public:
mBrowserBox->getHeight() + 8);
}
- void handleLink(const std::string &link, gcn::MouseEvent *event _UNUSED_)
+ void handleLink(const std::string &link, gcn::MouseEvent *event A_UNUSED)
{
if (link == "guild" && socialWindow)
{
diff --git a/src/gui/socialwindow.h b/src/gui/socialwindow.h
index c9cd296dc..04692d843 100644
--- a/src/gui/socialwindow.h
+++ b/src/gui/socialwindow.h
@@ -31,9 +31,9 @@
#include <map>
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
class AttackTab;
diff --git a/src/gui/specialswindow.h b/src/gui/specialswindow.h
index 2c7434f40..030c1343b 100644
--- a/src/gui/specialswindow.h
+++ b/src/gui/specialswindow.h
@@ -35,9 +35,9 @@
#include <map>
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
class Label;
diff --git a/src/gui/statuswindow.cpp b/src/gui/statuswindow.cpp
index bfd18c40f..b96720341 100644
--- a/src/gui/statuswindow.cpp
+++ b/src/gui/statuswindow.cpp
@@ -262,7 +262,7 @@ StatusWindow::StatusWindow():
mLvlLabel->adjustSize();
}
-void StatusWindow::event(Mana::Channels channel _UNUSED_,
+void StatusWindow::event(Mana::Channels channel A_UNUSED,
const Mana::Event &event)
{
static bool blocked = false;
@@ -402,7 +402,7 @@ void StatusWindow::setPointsNeeded(int id, int needed)
void StatusWindow::addAttribute(int id, const std::string &name,
bool modifiable,
- const std::string &description _UNUSED_)
+ const std::string &description A_UNUSED)
{
AttrDisplay *disp;
@@ -620,7 +620,7 @@ std::string StatusWindow::translateLetter(char* letters)
return std::string(buf);
}
-void StatusWindow::updateStatusBar(ProgressBar *bar, bool percent _UNUSED_)
+void StatusWindow::updateStatusBar(ProgressBar *bar, bool percent A_UNUSED)
{
if (!player_node || !viewport)
return;
diff --git a/src/gui/statuswindow.h b/src/gui/statuswindow.h
index 79126a095..74eb2c401 100644
--- a/src/gui/statuswindow.h
+++ b/src/gui/statuswindow.h
@@ -38,9 +38,9 @@ class ScrollArea;
class VertContainer;
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
/**
diff --git a/src/gui/updatewindow.h b/src/gui/updatewindow.h
index 03fd57d1c..a1dc556d5 100644
--- a/src/gui/updatewindow.h
+++ b/src/gui/updatewindow.h
@@ -20,8 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _UPDATERWINDOW_H
-#define _UPDATERWINDOW_H
+#ifndef UPDATERWINDOW_H
+#define UPDATERWINDOW_H
#include "gui/widgets/window.h"
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 1b8769602..79e536c2f 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -561,7 +561,7 @@ void Viewport::mouseDragged(gcn::MouseEvent &event)
}
}
-void Viewport::mouseReleased(gcn::MouseEvent &event _UNUSED_)
+void Viewport::mouseReleased(gcn::MouseEvent &event A_UNUSED)
{
mPlayerFollowMouse = false;
@@ -667,14 +667,14 @@ void Viewport::closePopupMenu()
mPopupMenu->handleLink("cancel", 0);
}
-void Viewport::optionChanged(const std::string &name _UNUSED_)
+void Viewport::optionChanged(const std::string &name A_UNUSED)
{
mScrollLaziness = config.getIntValue("ScrollLaziness");
mScrollRadius = config.getIntValue("ScrollRadius");
mShowBeingPopup = config.getBoolValue("showBeingPopup");
}
-void Viewport::mouseMoved(gcn::MouseEvent &event _UNUSED_)
+void Viewport::mouseMoved(gcn::MouseEvent &event A_UNUSED)
{
// Check if we are on the map
if (!mMap || !player_node || !actorSpriteManager)
diff --git a/src/gui/viewport.h b/src/gui/viewport.h
index 774392cc0..6657b98f3 100644
--- a/src/gui/viewport.h
+++ b/src/gui/viewport.h
@@ -32,9 +32,9 @@
#include <guichan/mouselistener.hpp>
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
class ActorSprite;
diff --git a/src/gui/whoisonline.h b/src/gui/whoisonline.h
index d6ac177d6..644121d08 100644
--- a/src/gui/whoisonline.h
+++ b/src/gui/whoisonline.h
@@ -20,8 +20,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef _WHOISONLINE_H
-#define _WHOISONLINE_H
+#ifndef WHOISONLINE_H
+#define WHOISONLINE_H
#include <string>
#include <set>
diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp
index 0bc5ec9ef..0570630c3 100644
--- a/src/gui/widgets/button.cpp
+++ b/src/gui/widgets/button.cpp
@@ -286,12 +286,12 @@ void Button::mouseReleased(gcn::MouseEvent& mouseEvent)
}
}
-void Button::widgetResized(const gcn::Event &event _UNUSED_)
+void Button::widgetResized(const gcn::Event &event A_UNUSED)
{
mRedraw = true;
}
-void Button::widgetMoved(const gcn::Event &event _UNUSED_)
+void Button::widgetMoved(const gcn::Event &event A_UNUSED)
{
mRedraw = true;
}
diff --git a/src/gui/widgets/chattab.h b/src/gui/widgets/chattab.h
index 5cbb71d79..4e077fafb 100644
--- a/src/gui/widgets/chattab.h
+++ b/src/gui/widgets/chattab.h
@@ -29,9 +29,9 @@
#include "gui/widgets/tab.h"
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
class ScrollArea;
@@ -115,8 +115,8 @@ class ChatTab : public Tab
* @returns true if the command was handled
* false if the command was not handled
*/
- virtual bool handleCommand(const std::string &type _UNUSED_,
- const std::string &args _UNUSED_)
+ virtual bool handleCommand(const std::string &type A_UNUSED,
+ const std::string &args A_UNUSED)
{ return false; }
/**
diff --git a/src/gui/widgets/checkbox.cpp b/src/gui/widgets/checkbox.cpp
index 0422345f7..61e5d9118 100644
--- a/src/gui/widgets/checkbox.cpp
+++ b/src/gui/widgets/checkbox.cpp
@@ -179,12 +179,12 @@ void CheckBox::drawBox(gcn::Graphics* graphics)
static_cast<Graphics*>(graphics)->drawImage(box, 2, 2);
}
-void CheckBox::mouseEntered(gcn::MouseEvent& event _UNUSED_)
+void CheckBox::mouseEntered(gcn::MouseEvent& event A_UNUSED)
{
mHasMouse = true;
}
-void CheckBox::mouseExited(gcn::MouseEvent& event _UNUSED_)
+void CheckBox::mouseExited(gcn::MouseEvent& event A_UNUSED)
{
mHasMouse = false;
}
diff --git a/src/gui/widgets/checkbox.h b/src/gui/widgets/checkbox.h
index a8324e2fa..a16ab242c 100644
--- a/src/gui/widgets/checkbox.h
+++ b/src/gui/widgets/checkbox.h
@@ -26,9 +26,9 @@
#include <guichan/widgets/checkbox.hpp>
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
class Image;
diff --git a/src/gui/widgets/desktop.cpp b/src/gui/widgets/desktop.cpp
index 6ba6477d6..3ade3b37f 100644
--- a/src/gui/widgets/desktop.cpp
+++ b/src/gui/widgets/desktop.cpp
@@ -72,7 +72,7 @@ void Desktop::reloadWallpaper()
setBestFittingWallpaper();
}
-void Desktop::widgetResized(const gcn::Event &event _UNUSED_)
+void Desktop::widgetResized(const gcn::Event &event A_UNUSED)
{
setBestFittingWallpaper();
}
diff --git a/src/gui/widgets/desktop.h b/src/gui/widgets/desktop.h
index 7666b9e22..962cc3c01 100644
--- a/src/gui/widgets/desktop.h
+++ b/src/gui/widgets/desktop.h
@@ -28,9 +28,9 @@
#include <guichan/widgetlistener.hpp>
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
class Image;
diff --git a/src/gui/widgets/dropshortcutcontainer.cpp b/src/gui/widgets/dropshortcutcontainer.cpp
index 7fec6bf44..257f4837c 100644
--- a/src/gui/widgets/dropshortcutcontainer.cpp
+++ b/src/gui/widgets/dropshortcutcontainer.cpp
@@ -307,7 +307,7 @@ void DropShortcutContainer::mouseMoved(gcn::MouseEvent &event)
}
// Hide ItemTooltip
-void DropShortcutContainer::mouseExited(gcn::MouseEvent &event _UNUSED_)
+void DropShortcutContainer::mouseExited(gcn::MouseEvent &event A_UNUSED)
{
mItemPopup->setVisible(false);
}
diff --git a/src/gui/widgets/dropshortcutcontainer.h b/src/gui/widgets/dropshortcutcontainer.h
index c072f0613..77de914ea 100644
--- a/src/gui/widgets/dropshortcutcontainer.h
+++ b/src/gui/widgets/dropshortcutcontainer.h
@@ -28,9 +28,9 @@
#include "gui/widgets/shortcutcontainer.h"
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
class Image;
diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp
index bdba4a807..bb5af4b1c 100644
--- a/src/gui/widgets/emoteshortcutcontainer.cpp
+++ b/src/gui/widgets/emoteshortcutcontainer.cpp
@@ -258,7 +258,7 @@ void EmoteShortcutContainer::mouseMoved(gcn::MouseEvent &event)
}
}
-void EmoteShortcutContainer::mouseExited(gcn::MouseEvent &event _UNUSED_)
+void EmoteShortcutContainer::mouseExited(gcn::MouseEvent &event A_UNUSED)
{
if (mEmotePopup)
mEmotePopup->setVisible(false);
diff --git a/src/gui/widgets/flowcontainer.cpp b/src/gui/widgets/flowcontainer.cpp
index 98b90cdc7..33e3790a0 100644
--- a/src/gui/widgets/flowcontainer.cpp
+++ b/src/gui/widgets/flowcontainer.cpp
@@ -34,7 +34,7 @@ FlowContainer::FlowContainer(int boxWidth, int boxHeight):
mBoxHeight = 1;
}
-void FlowContainer::widgetResized(const gcn::Event &event _UNUSED_)
+void FlowContainer::widgetResized(const gcn::Event &event A_UNUSED)
{
if (getWidth() < mBoxWidth)
{
diff --git a/src/gui/widgets/flowcontainer.h b/src/gui/widgets/flowcontainer.h
index 6d2a716ef..2ef6035f0 100644
--- a/src/gui/widgets/flowcontainer.h
+++ b/src/gui/widgets/flowcontainer.h
@@ -27,9 +27,9 @@
#include <guichan/widgetlistener.hpp>
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
/**
diff --git a/src/gui/widgets/horizontcontainer.cpp b/src/gui/widgets/horizontcontainer.cpp
index 95320055c..dbb02498a 100644
--- a/src/gui/widgets/horizontcontainer.cpp
+++ b/src/gui/widgets/horizontcontainer.cpp
@@ -50,6 +50,6 @@ void HorizontContainer::clear()
mCount = 0;
}
-void HorizontContainer::widgetResized(const gcn::Event &event _UNUSED_)
+void HorizontContainer::widgetResized(const gcn::Event &event A_UNUSED)
{
}
diff --git a/src/gui/widgets/horizontcontainer.h b/src/gui/widgets/horizontcontainer.h
index 99d05b11c..4a959190e 100644
--- a/src/gui/widgets/horizontcontainer.h
+++ b/src/gui/widgets/horizontcontainer.h
@@ -27,9 +27,9 @@
#include <guichan/widgetlistener.hpp>
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
/**
diff --git a/src/gui/widgets/inventoryfilter.h b/src/gui/widgets/inventoryfilter.h
index ed49ba39b..da7b7af1e 100644
--- a/src/gui/widgets/inventoryfilter.h
+++ b/src/gui/widgets/inventoryfilter.h
@@ -28,9 +28,9 @@
#include "gui/widgets/horizontcontainer.h"
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
class InventoryFilter : public HorizontContainer, public gcn::ActionListener
diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp
index a9d1f5279..7818432f8 100644
--- a/src/gui/widgets/itemcontainer.cpp
+++ b/src/gui/widgets/itemcontainer.cpp
@@ -265,7 +265,7 @@ void ItemContainer::distributeValueChangedEvent()
}
}
-void ItemContainer::keyPressed(gcn::KeyEvent &event _UNUSED_)
+void ItemContainer::keyPressed(gcn::KeyEvent &event A_UNUSED)
{
/*switch (event.getKey().getValue())
{
@@ -294,7 +294,7 @@ void ItemContainer::keyPressed(gcn::KeyEvent &event _UNUSED_)
}*/
}
-void ItemContainer::keyReleased(gcn::KeyEvent &event _UNUSED_)
+void ItemContainer::keyReleased(gcn::KeyEvent &event A_UNUSED)
{
/*switch (event.getKey().getValue())
{
@@ -414,12 +414,12 @@ void ItemContainer::mouseMoved(gcn::MouseEvent &event)
}
// Hide ItemTooltip
-void ItemContainer::mouseExited(gcn::MouseEvent &event _UNUSED_)
+void ItemContainer::mouseExited(gcn::MouseEvent &event A_UNUSED)
{
mItemPopup->setVisible(false);
}
-void ItemContainer::widgetResized(const gcn::Event &event _UNUSED_)
+void ItemContainer::widgetResized(const gcn::Event &event A_UNUSED)
{
mGridColumns = std::max(1, getWidth() / BOX_WIDTH);
adjustHeight();
diff --git a/src/gui/widgets/itemcontainer.h b/src/gui/widgets/itemcontainer.h
index 05988b742..5fd897a29 100644
--- a/src/gui/widgets/itemcontainer.h
+++ b/src/gui/widgets/itemcontainer.h
@@ -32,9 +32,9 @@
#include <algorithm>
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
class Image;
diff --git a/src/gui/widgets/itemlinkhandler.cpp b/src/gui/widgets/itemlinkhandler.cpp
index 0d6ef9990..6ae0f6b5b 100644
--- a/src/gui/widgets/itemlinkhandler.cpp
+++ b/src/gui/widgets/itemlinkhandler.cpp
@@ -46,7 +46,7 @@ ItemLinkHandler::~ItemLinkHandler()
}
void ItemLinkHandler::handleLink(const std::string &link,
- gcn::MouseEvent *event _UNUSED_)
+ gcn::MouseEvent *event A_UNUSED)
{
if (!mItemPopup)
return;
diff --git a/src/gui/widgets/itemlinkhandler.h b/src/gui/widgets/itemlinkhandler.h
index b48f87978..8dd2f62f5 100644
--- a/src/gui/widgets/itemlinkhandler.h
+++ b/src/gui/widgets/itemlinkhandler.h
@@ -26,9 +26,9 @@
#include "gui/widgets/linkhandler.h"
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
class ItemPopup;
@@ -39,7 +39,7 @@ class ItemLinkHandler : public LinkHandler
ItemLinkHandler();
~ItemLinkHandler();
void handleLink(const std::string &link,
- gcn::MouseEvent *event _UNUSED_);
+ gcn::MouseEvent *event A_UNUSED);
private:
ItemPopup *mItemPopup;
diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp
index ab089ca45..328d5ae4d 100644
--- a/src/gui/widgets/itemshortcutcontainer.cpp
+++ b/src/gui/widgets/itemshortcutcontainer.cpp
@@ -378,7 +378,7 @@ void ItemShortcutContainer::mouseMoved(gcn::MouseEvent &event)
}
// Hide ItemTooltip
-void ItemShortcutContainer::mouseExited(gcn::MouseEvent &event _UNUSED_)
+void ItemShortcutContainer::mouseExited(gcn::MouseEvent &event A_UNUSED)
{
mItemPopup->setVisible(false);
mSpellPopup->setVisible(false);
diff --git a/src/gui/widgets/itemshortcutcontainer.h b/src/gui/widgets/itemshortcutcontainer.h
index bd3df56e5..7eac431ec 100644
--- a/src/gui/widgets/itemshortcutcontainer.h
+++ b/src/gui/widgets/itemshortcutcontainer.h
@@ -30,9 +30,9 @@
#include <guichan/mouselistener.hpp>
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
class Image;
diff --git a/src/gui/widgets/layouthelper.cpp b/src/gui/widgets/layouthelper.cpp
index cded6313a..ace204143 100644
--- a/src/gui/widgets/layouthelper.cpp
+++ b/src/gui/widgets/layouthelper.cpp
@@ -57,7 +57,7 @@ void LayoutHelper::reflowLayout(int w, int h)
mContainer->setSize(w, h);
}
-void LayoutHelper::widgetResized(const gcn::Event &event _UNUSED_)
+void LayoutHelper::widgetResized(const gcn::Event &event A_UNUSED)
{
const gcn::Rectangle area = mContainer->getChildrenArea();
int w = area.width;
diff --git a/src/gui/widgets/layouthelper.h b/src/gui/widgets/layouthelper.h
index f4f0d25c9..9b2795be7 100644
--- a/src/gui/widgets/layouthelper.h
+++ b/src/gui/widgets/layouthelper.h
@@ -28,9 +28,9 @@
#include <guichan/widgetlistener.hpp>
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
/**
diff --git a/src/gui/widgets/listbox.cpp b/src/gui/widgets/listbox.cpp
index ae75d469e..de8707406 100644
--- a/src/gui/widgets/listbox.cpp
+++ b/src/gui/widgets/listbox.cpp
@@ -129,11 +129,11 @@ void ListBox::keyPressed(gcn::KeyEvent& keyEvent)
// Don't do anything on scrollwheel. ScrollArea will deal with that.
-void ListBox::mouseWheelMovedUp(gcn::MouseEvent &mouseEvent _UNUSED_)
+void ListBox::mouseWheelMovedUp(gcn::MouseEvent &mouseEvent A_UNUSED)
{
}
-void ListBox::mouseWheelMovedDown(gcn::MouseEvent &mouseEvent _UNUSED_)
+void ListBox::mouseWheelMovedDown(gcn::MouseEvent &mouseEvent A_UNUSED)
{
}
diff --git a/src/gui/widgets/listbox.h b/src/gui/widgets/listbox.h
index 7a372e7e2..5f8c20059 100644
--- a/src/gui/widgets/listbox.h
+++ b/src/gui/widgets/listbox.h
@@ -26,9 +26,9 @@
#include <guichan/widgets/listbox.hpp>
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
class SelectionListener;
diff --git a/src/gui/widgets/popup.cpp b/src/gui/widgets/popup.cpp
index f81b4ac7b..ea51c146a 100644
--- a/src/gui/widgets/popup.cpp
+++ b/src/gui/widgets/popup.cpp
@@ -201,7 +201,7 @@ void Popup::position(int x, int y)
mRedraw = true;
}
-void Popup::mouseMoved(gcn::MouseEvent &event _UNUSED_)
+void Popup::mouseMoved(gcn::MouseEvent &event A_UNUSED)
{
if (viewport)
viewport->hideBeingPopup();
@@ -214,12 +214,12 @@ void Popup::hide()
mRedraw = true;
}
-void Popup::widgetResized(const gcn::Event &event _UNUSED_)
+void Popup::widgetResized(const gcn::Event &event A_UNUSED)
{
mRedraw = true;
}
-void Popup::widgetMoved(const gcn::Event &event _UNUSED_)
+void Popup::widgetMoved(const gcn::Event &event A_UNUSED)
{
mRedraw = true;
}
diff --git a/src/gui/widgets/popup.h b/src/gui/widgets/popup.h
index 963477fbb..0ac50f69e 100644
--- a/src/gui/widgets/popup.h
+++ b/src/gui/widgets/popup.h
@@ -33,9 +33,9 @@
#include <guichan/widgetlistener.hpp>
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
class GraphicsVertexes;
diff --git a/src/gui/widgets/progressbar.cpp b/src/gui/widgets/progressbar.cpp
index 363bab319..c1d6a9531 100644
--- a/src/gui/widgets/progressbar.cpp
+++ b/src/gui/widgets/progressbar.cpp
@@ -281,12 +281,12 @@ void ProgressBar::render(Graphics *graphics, const gcn::Rectangle &area,
graphics->setColor(oldColor);
}
-void ProgressBar::widgetResized(const gcn::Event &event _UNUSED_)
+void ProgressBar::widgetResized(const gcn::Event &event A_UNUSED)
{
mRedraw = true;
}
-void ProgressBar::widgetMoved(const gcn::Event &event _UNUSED_)
+void ProgressBar::widgetMoved(const gcn::Event &event A_UNUSED)
{
mRedraw = true;
}
diff --git a/src/gui/widgets/radiobutton.cpp b/src/gui/widgets/radiobutton.cpp
index 8e3fdb9bb..a82ec3e8d 100644
--- a/src/gui/widgets/radiobutton.cpp
+++ b/src/gui/widgets/radiobutton.cpp
@@ -155,12 +155,12 @@ void RadioButton::draw(gcn::Graphics* graphics)
graphics->drawText(getCaption(), 16, 0);
}
-void RadioButton::mouseEntered(gcn::MouseEvent& event _UNUSED_)
+void RadioButton::mouseEntered(gcn::MouseEvent& event A_UNUSED)
{
mHasMouse = true;
}
-void RadioButton::mouseExited(gcn::MouseEvent& event _UNUSED_)
+void RadioButton::mouseExited(gcn::MouseEvent& event A_UNUSED)
{
mHasMouse = false;
}
diff --git a/src/gui/widgets/radiobutton.h b/src/gui/widgets/radiobutton.h
index 32a06c97d..677195bd6 100644
--- a/src/gui/widgets/radiobutton.h
+++ b/src/gui/widgets/radiobutton.h
@@ -26,9 +26,9 @@
#include <guichan/widgets/radiobutton.hpp>
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
class Image;
diff --git a/src/gui/widgets/scrollarea.cpp b/src/gui/widgets/scrollarea.cpp
index e290be21a..df39854da 100644
--- a/src/gui/widgets/scrollarea.cpp
+++ b/src/gui/widgets/scrollarea.cpp
@@ -320,7 +320,7 @@ void ScrollArea::draw(gcn::Graphics *graphics)
drawChildren(graphics);
}
-//void ScrollArea::drawFrame(gcn::Graphics *graphics _UNUSED_)
+//void ScrollArea::drawFrame(gcn::Graphics *graphics A_UNUSED)
void ScrollArea::drawFrame(gcn::Graphics *graphics)
{
if (mOpaque)
@@ -490,24 +490,24 @@ void ScrollArea::mouseMoved(gcn::MouseEvent& event)
mY = event.getY();
}
-void ScrollArea::mouseEntered(gcn::MouseEvent& event _UNUSED_)
+void ScrollArea::mouseEntered(gcn::MouseEvent& event A_UNUSED)
{
mHasMouse = true;
}
-void ScrollArea::mouseExited(gcn::MouseEvent& event _UNUSED_)
+void ScrollArea::mouseExited(gcn::MouseEvent& event A_UNUSED)
{
mHasMouse = false;
}
-void ScrollArea::widgetResized(const gcn::Event &event _UNUSED_)
+void ScrollArea::widgetResized(const gcn::Event &event A_UNUSED)
{
mRedraw = true;
getContent()->setSize(getWidth() - 2 * getFrameSize(),
getHeight() - 2 * getFrameSize());
}
-void ScrollArea::widgetMoved(const gcn::Event& event _UNUSED_)
+void ScrollArea::widgetMoved(const gcn::Event& event A_UNUSED)
{
mRedraw = true;
}
diff --git a/src/gui/widgets/scrollarea.h b/src/gui/widgets/scrollarea.h
index 0e5a8f850..440fcec15 100644
--- a/src/gui/widgets/scrollarea.h
+++ b/src/gui/widgets/scrollarea.h
@@ -27,9 +27,9 @@
#include <guichan/widgetlistener.hpp>
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
class GraphicsVertexes;
diff --git a/src/gui/widgets/setuptabscroll.h b/src/gui/widgets/setuptabscroll.h
index 78391f29b..d2aa7002f 100644
--- a/src/gui/widgets/setuptabscroll.h
+++ b/src/gui/widgets/setuptabscroll.h
@@ -27,9 +27,9 @@
#include <set>
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
class SetupItem;
@@ -56,7 +56,7 @@ class SetupTabScroll : public SetupTab
virtual void externalUpdated();
- virtual void action(const gcn::ActionEvent &event _UNUSED_)
+ virtual void action(const gcn::ActionEvent &event A_UNUSED)
{ }
protected:
diff --git a/src/gui/widgets/shoplistbox.cpp b/src/gui/widgets/shoplistbox.cpp
index 81a3b7b58..2fe28181b 100644
--- a/src/gui/widgets/shoplistbox.cpp
+++ b/src/gui/widgets/shoplistbox.cpp
@@ -179,7 +179,7 @@ void ShopListBox::mouseMoved(gcn::MouseEvent &event)
}
}
-void ShopListBox::mouseExited(gcn::MouseEvent& mouseEvent _UNUSED_)
+void ShopListBox::mouseExited(gcn::MouseEvent& mouseEvent A_UNUSED)
{
if (!mItemPopup)
return;
diff --git a/src/gui/widgets/shoplistbox.h b/src/gui/widgets/shoplistbox.h
index 095625731..917f46729 100644
--- a/src/gui/widgets/shoplistbox.h
+++ b/src/gui/widgets/shoplistbox.h
@@ -26,9 +26,9 @@
#include "gui/widgets/listbox.h"
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
class ShopItems;
@@ -82,7 +82,7 @@ class ShopListBox : public ListBox
void mouseMoved(gcn::MouseEvent &event);
- void mouseExited(gcn::MouseEvent& mouseEvent _UNUSED_);
+ void mouseExited(gcn::MouseEvent& mouseEvent A_UNUSED);
private:
int mPlayerMoney;
diff --git a/src/gui/widgets/shortcutcontainer.cpp b/src/gui/widgets/shortcutcontainer.cpp
index d4065677a..9fd9b26c6 100644
--- a/src/gui/widgets/shortcutcontainer.cpp
+++ b/src/gui/widgets/shortcutcontainer.cpp
@@ -44,7 +44,7 @@ ShortcutContainer::ShortcutContainer():
{
}
-void ShortcutContainer::widgetResized(const gcn::Event &event _UNUSED_)
+void ShortcutContainer::widgetResized(const gcn::Event &event A_UNUSED)
{
mGridWidth = getWidth() / mBoxWidth;
diff --git a/src/gui/widgets/shortcutcontainer.h b/src/gui/widgets/shortcutcontainer.h
index 42454fe2b..df8529bd5 100644
--- a/src/gui/widgets/shortcutcontainer.h
+++ b/src/gui/widgets/shortcutcontainer.h
@@ -30,9 +30,9 @@
#include "gui/widgets/tab.h"
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
class Image;
diff --git a/src/gui/widgets/slider.cpp b/src/gui/widgets/slider.cpp
index 7950f6a24..d29c2211f 100644
--- a/src/gui/widgets/slider.cpp
+++ b/src/gui/widgets/slider.cpp
@@ -289,12 +289,12 @@ void Slider::drawMarker(gcn::Graphics *graphics)
(getHeight() - (mHasMouse?hGripHi:hGrip)->getHeight()) / 2);
}
-void Slider::mouseEntered(gcn::MouseEvent& event _UNUSED_)
+void Slider::mouseEntered(gcn::MouseEvent& event A_UNUSED)
{
mHasMouse = true;
}
-void Slider::mouseExited(gcn::MouseEvent& event _UNUSED_)
+void Slider::mouseExited(gcn::MouseEvent& event A_UNUSED)
{
mHasMouse = false;
}
diff --git a/src/gui/widgets/slider.h b/src/gui/widgets/slider.h
index bcc5de3c7..619c0c795 100644
--- a/src/gui/widgets/slider.h
+++ b/src/gui/widgets/slider.h
@@ -26,9 +26,9 @@
#include <guichan/widgets/slider.hpp>
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
class Image;
diff --git a/src/gui/widgets/spellshortcutcontainer.cpp b/src/gui/widgets/spellshortcutcontainer.cpp
index bfeecbfa0..0f4814429 100644
--- a/src/gui/widgets/spellshortcutcontainer.cpp
+++ b/src/gui/widgets/spellshortcutcontainer.cpp
@@ -287,7 +287,7 @@ void SpellShortcutContainer::mouseMoved(gcn::MouseEvent &event)
}
// Hide SpellTooltip
-void SpellShortcutContainer::mouseExited(gcn::MouseEvent &event _UNUSED_)
+void SpellShortcutContainer::mouseExited(gcn::MouseEvent &event A_UNUSED)
{
mSpellPopup->setVisible(false);
}
diff --git a/src/gui/widgets/spellshortcutcontainer.h b/src/gui/widgets/spellshortcutcontainer.h
index a4ad1576a..28016cbad 100644
--- a/src/gui/widgets/spellshortcutcontainer.h
+++ b/src/gui/widgets/spellshortcutcontainer.h
@@ -29,9 +29,9 @@
//#include "textcommand.h"
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
class Image;
diff --git a/src/gui/widgets/tab.cpp b/src/gui/widgets/tab.cpp
index 610bf7e68..1b548a6a3 100644
--- a/src/gui/widgets/tab.cpp
+++ b/src/gui/widgets/tab.cpp
@@ -220,12 +220,12 @@ void Tab::setFlash(int flash)
mFlash = flash;
}
-void Tab::widgetResized(const gcn::Event &event _UNUSED_)
+void Tab::widgetResized(const gcn::Event &event A_UNUSED)
{
mRedraw = true;
}
-void Tab::widgetMoved(const gcn::Event &event _UNUSED_)
+void Tab::widgetMoved(const gcn::Event &event A_UNUSED)
{
mRedraw = true;
}
diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp
index b20237c1b..d3539a115 100644
--- a/src/gui/widgets/tabbedarea.cpp
+++ b/src/gui/widgets/tabbedarea.cpp
@@ -241,7 +241,7 @@ void TabbedArea::setSelectedTab(gcn::Tab *tab)
widgetResized(NULL);
}
-void TabbedArea::widgetResized(const gcn::Event &event _UNUSED_)
+void TabbedArea::widgetResized(const gcn::Event &event A_UNUSED)
{
int width = getWidth() - 2 * getFrameSize()
- 2 * mWidgetContainer->getFrameSize();
diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h
index d6f0783df..a91b4c199 100644
--- a/src/gui/widgets/tabbedarea.h
+++ b/src/gui/widgets/tabbedarea.h
@@ -33,9 +33,9 @@
#include <string>
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
class Tab;
diff --git a/src/gui/widgets/table.cpp b/src/gui/widgets/table.cpp
index d5325679f..04ae41ad7 100644
--- a/src/gui/widgets/table.cpp
+++ b/src/gui/widgets/table.cpp
@@ -81,7 +81,7 @@ GuiTableActionListener::~GuiTableActionListener()
}
void GuiTableActionListener::action(const gcn::ActionEvent
- &actionEvent _UNUSED_)
+ &actionEvent A_UNUSED)
{
mTable->setSelected(mRow, mColumn);
mTable->distributeActionEvent();
diff --git a/src/gui/widgets/table.h b/src/gui/widgets/table.h
index 48075d53a..c4fab6a0d 100644
--- a/src/gui/widgets/table.h
+++ b/src/gui/widgets/table.h
@@ -32,9 +32,9 @@
#include <vector>
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
class GuiTableActionListener;
diff --git a/src/gui/widgets/vertcontainer.cpp b/src/gui/widgets/vertcontainer.cpp
index 3dd258ad3..d65274f20 100644
--- a/src/gui/widgets/vertcontainer.cpp
+++ b/src/gui/widgets/vertcontainer.cpp
@@ -71,7 +71,7 @@ void VertContainer::clear()
mCount = 0;
}
-void VertContainer::widgetResized(const gcn::Event &event _UNUSED_)
+void VertContainer::widgetResized(const gcn::Event &event A_UNUSED)
{
for (std::vector<gcn::Widget*>::iterator it = mResizableWidgets.begin();
it != mResizableWidgets.end(); ++ it)
diff --git a/src/gui/widgets/vertcontainer.h b/src/gui/widgets/vertcontainer.h
index cccd772b8..3b0ceeca7 100644
--- a/src/gui/widgets/vertcontainer.h
+++ b/src/gui/widgets/vertcontainer.h
@@ -29,9 +29,9 @@
#include <vector>
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
/**
diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp
index 7b88f0421..14448ea86 100644
--- a/src/gui/widgets/window.cpp
+++ b/src/gui/widgets/window.cpp
@@ -341,7 +341,7 @@ void Window::setResizable(bool r)
}
}
-void Window::widgetResized(const gcn::Event &event _UNUSED_)
+void Window::widgetResized(const gcn::Event &event A_UNUSED)
{
const gcn::Rectangle area = getChildrenArea();
@@ -361,12 +361,12 @@ void Window::widgetResized(const gcn::Event &event _UNUSED_)
mRedraw = true;
}
-void Window::widgetMoved(const gcn::Event& event _UNUSED_)
+void Window::widgetMoved(const gcn::Event& event A_UNUSED)
{
mRedraw = true;
}
-void Window::widgetHidden(const gcn::Event &event _UNUSED_)
+void Window::widgetHidden(const gcn::Event &event A_UNUSED)
{
if (gui)
gui->setCursorType(Gui::CURSOR_POINTER);
@@ -492,7 +492,7 @@ void Window::close()
setVisible(false);
}
-void Window::mouseReleased(gcn::MouseEvent &event _UNUSED_)
+void Window::mouseReleased(gcn::MouseEvent &event A_UNUSED)
{
if (mGrip && mouseResize)
{
@@ -505,7 +505,7 @@ void Window::mouseReleased(gcn::MouseEvent &event _UNUSED_)
mMoved = false;
}
-void Window::mouseExited(gcn::MouseEvent &event _UNUSED_)
+void Window::mouseExited(gcn::MouseEvent &event A_UNUSED)
{
if (mGrip && !mouseResize && gui)
gui->setCursorType(Gui::CURSOR_POINTER);
diff --git a/src/gui/widgets/window.h b/src/gui/widgets/window.h
index 4e9a6d87b..d36d6c5ad 100644
--- a/src/gui/widgets/window.h
+++ b/src/gui/widgets/window.h
@@ -31,9 +31,9 @@
#include <guichan/widgets/window.hpp>
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
class ContainerPlacer;
diff --git a/src/gui/windowmenu.cpp b/src/gui/windowmenu.cpp
index e47888a3a..0d81ba3a9 100644
--- a/src/gui/windowmenu.cpp
+++ b/src/gui/windowmenu.cpp
@@ -307,7 +307,7 @@ void WindowMenu::mouseMoved(gcn::MouseEvent &event)
}
}
-void WindowMenu::mouseExited(gcn::MouseEvent& mouseEvent _UNUSED_)
+void WindowMenu::mouseExited(gcn::MouseEvent& mouseEvent A_UNUSED)
{
if (!mTextPopup)
return;
diff --git a/src/gui/windowmenu.h b/src/gui/windowmenu.h
index 503a8c1ad..6572fe470 100644
--- a/src/gui/windowmenu.h
+++ b/src/gui/windowmenu.h
@@ -33,9 +33,9 @@
#include <vector>
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
class EmotePopup;
@@ -64,7 +64,7 @@ class WindowMenu : public Container,
void mouseMoved(gcn::MouseEvent &event);
- void mouseExited(gcn::MouseEvent& mouseEvent _UNUSED_);
+ void mouseExited(gcn::MouseEvent& mouseEvent A_UNUSED);
std::map <std::string, gcn::Button*> &getButtonNames()
{ return mButtonNames; }
diff --git a/src/guichan/defaultfont.cpp b/src/guichan/defaultfont.cpp
index 4306c7928..f67b66495 100644
--- a/src/guichan/defaultfont.cpp
+++ b/src/guichan/defaultfont.cpp
@@ -67,7 +67,7 @@ namespace gcn
}
int DefaultFont::drawGlyph(Graphics* graphics,
- unsigned char glyph _UNUSED_, int x, int y)
+ unsigned char glyph A_UNUSED, int x, int y)
{
graphics->drawRectangle( Rectangle(x, y, 8, 8));
diff --git a/src/guichan/include/guichan/defaultfont.hpp b/src/guichan/include/guichan/defaultfont.hpp
index e5a830e4c..3f6379cbe 100644
--- a/src/guichan/include/guichan/defaultfont.hpp
+++ b/src/guichan/include/guichan/defaultfont.hpp
@@ -48,9 +48,9 @@
#include "guichan/platform.hpp"
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
namespace gcn
diff --git a/src/guichan/include/guichan/focuslistener.hpp b/src/guichan/include/guichan/focuslistener.hpp
index 8e3f63d71..548d05f4d 100644
--- a/src/guichan/include/guichan/focuslistener.hpp
+++ b/src/guichan/include/guichan/focuslistener.hpp
@@ -50,9 +50,9 @@
#include "guichan/platform.hpp"
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
namespace gcn
@@ -78,14 +78,14 @@ namespace gcn
*
* @param event Discribes the event.
*/
- virtual void focusGained(const Event& event _UNUSED_) { };
+ virtual void focusGained(const Event& event A_UNUSED) { };
/**
* Called when a widget loses focus.
*
* @param event Discribes the event.
*/
- virtual void focusLost(const Event& event _UNUSED_) { };
+ virtual void focusLost(const Event& event A_UNUSED) { };
protected:
/**
diff --git a/src/guichan/include/guichan/keylistener.hpp b/src/guichan/include/guichan/keylistener.hpp
index caeed0da4..5449f2de4 100644
--- a/src/guichan/include/guichan/keylistener.hpp
+++ b/src/guichan/include/guichan/keylistener.hpp
@@ -48,9 +48,9 @@
#include "guichan/platform.hpp"
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
namespace gcn
@@ -78,14 +78,14 @@ namespace gcn
*
* @param keyEvent Discribes the event.
*/
- virtual void keyPressed(KeyEvent& keyEvent _UNUSED_) { }
+ virtual void keyPressed(KeyEvent& keyEvent A_UNUSED) { }
/**
* Called if a key is released when the widget has keyboard focus.
*
* @param keyEvent Discribes the event.
*/
- virtual void keyReleased(KeyEvent& keyEvent _UNUSED_) { }
+ virtual void keyReleased(KeyEvent& keyEvent A_UNUSED) { }
protected:
/**
diff --git a/src/guichan/include/guichan/mouselistener.hpp b/src/guichan/include/guichan/mouselistener.hpp
index 152d3494e..1612cc822 100644
--- a/src/guichan/include/guichan/mouselistener.hpp
+++ b/src/guichan/include/guichan/mouselistener.hpp
@@ -48,9 +48,9 @@
#include "guichan/platform.hpp"
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
namespace gcn
@@ -76,7 +76,7 @@ namespace gcn
* @param mouseEvent Describes the event.
* @since 0.6.0
*/
- virtual void mouseEntered(MouseEvent& mouseEvent _UNUSED_)
+ virtual void mouseEntered(MouseEvent& mouseEvent A_UNUSED)
{
}
@@ -87,7 +87,7 @@ namespace gcn
* @param mouseEvent Describes the event.
* @since 0.6.0
*/
- virtual void mouseExited(MouseEvent& mouseEvent _UNUSED_)
+ virtual void mouseExited(MouseEvent& mouseEvent A_UNUSED)
{
}
@@ -101,7 +101,7 @@ namespace gcn
* @param mouseEvent Describes the event.
* @since 0.6.0
*/
- virtual void mousePressed(MouseEvent& mouseEvent _UNUSED_)
+ virtual void mousePressed(MouseEvent& mouseEvent A_UNUSED)
{
}
@@ -112,7 +112,7 @@ namespace gcn
* @param mouseEvent Describes the event.
* @since 0.6.0
*/
- virtual void mouseReleased(MouseEvent& mouseEvent _UNUSED_)
+ virtual void mouseReleased(MouseEvent& mouseEvent A_UNUSED)
{
}
@@ -124,7 +124,7 @@ namespace gcn
* @param mouseEvent Describes the event.
* @since 0.6.0
*/
- virtual void mouseClicked(MouseEvent& mouseEvent _UNUSED_)
+ virtual void mouseClicked(MouseEvent& mouseEvent A_UNUSED)
{
}
@@ -135,7 +135,7 @@ namespace gcn
* @param mouseEvent Describes the event.
* @since 0.6.0
*/
- virtual void mouseWheelMovedUp(MouseEvent& mouseEvent _UNUSED_)
+ virtual void mouseWheelMovedUp(MouseEvent& mouseEvent A_UNUSED)
{
}
@@ -146,7 +146,7 @@ namespace gcn
* @param mousEvent Describes the event.
* @since 0.6.0
*/
- virtual void mouseWheelMovedDown(MouseEvent& mouseEvent _UNUSED_)
+ virtual void mouseWheelMovedDown(MouseEvent& mouseEvent A_UNUSED)
{
}
@@ -158,7 +158,7 @@ namespace gcn
* @param mouseEvent Describes the event.
* @since 0.6.0
*/
- virtual void mouseMoved(MouseEvent& mouseEvent _UNUSED_)
+ virtual void mouseMoved(MouseEvent& mouseEvent A_UNUSED)
{
}
@@ -170,7 +170,7 @@ namespace gcn
* @param mouseEvent Describes the event.
* @since 0.6.0
*/
- virtual void mouseDragged(MouseEvent& mouseEvent _UNUSED_)
+ virtual void mouseDragged(MouseEvent& mouseEvent A_UNUSED)
{
}
diff --git a/src/guichan/include/guichan/selectionlistener.hpp b/src/guichan/include/guichan/selectionlistener.hpp
index 139c46128..8ea8a579b 100644
--- a/src/guichan/include/guichan/selectionlistener.hpp
+++ b/src/guichan/include/guichan/selectionlistener.hpp
@@ -50,9 +50,9 @@
#include "guichan/platform.hpp"
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
namespace gcn
@@ -85,7 +85,7 @@ namespace gcn
* @param event The event of the value change.
* @since 0.8.0
*/
- virtual void valueChanged(const SelectionEvent& event _UNUSED_)
+ virtual void valueChanged(const SelectionEvent& event A_UNUSED)
{ };
protected:
diff --git a/src/guichan/include/guichan/widget.hpp b/src/guichan/include/guichan/widget.hpp
index ccb56ea70..d112022e3 100644
--- a/src/guichan/include/guichan/widget.hpp
+++ b/src/guichan/include/guichan/widget.hpp
@@ -52,9 +52,9 @@
#include "guichan/rectangle.hpp"
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
namespace gcn
@@ -894,7 +894,7 @@ namespace gcn
* @see moveToBottom
* @since 0.1.0
*/
- virtual void moveToTop(Widget* widget _UNUSED_) { };
+ virtual void moveToTop(Widget* widget A_UNUSED) { };
/**
* Moves a widget in this widget to the bottom of this widget.
@@ -904,7 +904,7 @@ namespace gcn
* @see moveToTop
* @since 0.1.0
*/
- virtual void moveToBottom(Widget* widget _UNUSED_) { };
+ virtual void moveToBottom(Widget* widget A_UNUSED) { };
/**
* Focuses the next widget in the widget.
@@ -930,8 +930,8 @@ namespace gcn
* @param area The area to show.
* @since 0.1.0
*/
- virtual void showWidgetPart(Widget* widget _UNUSED_,
- Rectangle area _UNUSED_)
+ virtual void showWidgetPart(Widget* widget A_UNUSED,
+ Rectangle area A_UNUSED)
{ };
/**
diff --git a/src/guichan/include/guichan/widgetlistener.hpp b/src/guichan/include/guichan/widgetlistener.hpp
index eb1f838ec..159549ede 100644
--- a/src/guichan/include/guichan/widgetlistener.hpp
+++ b/src/guichan/include/guichan/widgetlistener.hpp
@@ -50,9 +50,9 @@
#include "guichan/platform.hpp"
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
namespace gcn
@@ -81,7 +81,7 @@ namespace gcn
* @param event Describes the event.
* @since 0.8.0
*/
- virtual void widgetResized(const Event& event _UNUSED_) { }
+ virtual void widgetResized(const Event& event A_UNUSED) { }
/**
* Invoked when a widget is moved.
@@ -89,7 +89,7 @@ namespace gcn
* @param event Describes the event.
* @since 0.8.0
*/
- virtual void widgetMoved(const Event& event _UNUSED_) { }
+ virtual void widgetMoved(const Event& event A_UNUSED) { }
/**
* Invoked when a widget is hidden, i.e it's set to be
@@ -98,7 +98,7 @@ namespace gcn
* @param event Describes the event.
* @since 0.8.0
*/
- virtual void widgetHidden(const Event& event _UNUSED_) { }
+ virtual void widgetHidden(const Event& event A_UNUSED) { }
/**
* Invoked when a widget is shown, i.e it's set to be
@@ -107,7 +107,7 @@ namespace gcn
* @param event Describes the event.
* @since 0.8.0
*/
- virtual void widgetShown(const Event& event _UNUSED_) { }
+ virtual void widgetShown(const Event& event A_UNUSED) { }
protected:
/**
diff --git a/src/guichan/include/guichan/widgets/button.hpp b/src/guichan/include/guichan/widgets/button.hpp
index 05b961b1e..c0d0a237d 100644
--- a/src/guichan/include/guichan/widgets/button.hpp
+++ b/src/guichan/include/guichan/widgets/button.hpp
@@ -55,9 +55,9 @@
#include "guichan/widget.hpp"
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
namespace gcn
diff --git a/src/guichan/include/guichan/widgets/dropdown.hpp b/src/guichan/include/guichan/widgets/dropdown.hpp
index 5853783e5..c096bb03f 100644
--- a/src/guichan/include/guichan/widgets/dropdown.hpp
+++ b/src/guichan/include/guichan/widgets/dropdown.hpp
@@ -58,9 +58,9 @@
#include "guichan/widgets/scrollarea.hpp"
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
namespace gcn
diff --git a/src/guichan/include/guichan/widgets/tab.hpp b/src/guichan/include/guichan/widgets/tab.hpp
index d123bac15..91c09e270 100644
--- a/src/guichan/include/guichan/widgets/tab.hpp
+++ b/src/guichan/include/guichan/widgets/tab.hpp
@@ -52,9 +52,9 @@
#include "guichan/platform.hpp"
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
namespace gcn
diff --git a/src/guichan/include/guichan/widgets/window.hpp b/src/guichan/include/guichan/widgets/window.hpp
index 63685c7fb..3b9c62160 100644
--- a/src/guichan/include/guichan/widgets/window.hpp
+++ b/src/guichan/include/guichan/widgets/window.hpp
@@ -51,9 +51,9 @@
#include "guichan/widgets/container.hpp"
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
namespace gcn
diff --git a/src/guichan/widget.cpp b/src/guichan/widget.cpp
index 6c02384b9..e2ed26508 100644
--- a/src/guichan/widget.cpp
+++ b/src/guichan/widget.cpp
@@ -601,7 +601,7 @@ namespace gcn
return mFocusHandler->getModalMouseInputFocused() == this;
}
- Widget *Widget::getWidgetAt(int x _UNUSED_, int y _UNUSED_)
+ Widget *Widget::getWidgetAt(int x A_UNUSED, int y A_UNUSED)
{
return NULL;
}
diff --git a/src/guichan/widgets/button.cpp b/src/guichan/widgets/button.cpp
index 76d69bf2d..184b6235c 100644
--- a/src/guichan/widgets/button.cpp
+++ b/src/guichan/widgets/button.cpp
@@ -223,12 +223,12 @@ namespace gcn
}
}
- void Button::mouseExited(MouseEvent& mouseEvent _UNUSED_)
+ void Button::mouseExited(MouseEvent& mouseEvent A_UNUSED)
{
mHasMouse = false;
}
- void Button::mouseEntered(MouseEvent& mouseEvent _UNUSED_)
+ void Button::mouseEntered(MouseEvent& mouseEvent A_UNUSED)
{
mHasMouse = true;
}
@@ -281,7 +281,7 @@ namespace gcn
}
}
- void Button::focusLost(const Event& event _UNUSED_)
+ void Button::focusLost(const Event& event A_UNUSED)
{
mMousePressed = false;
mKeyPressed = false;
diff --git a/src/guichan/widgets/dropdown.cpp b/src/guichan/widgets/dropdown.cpp
index e02f0fa3b..7af01e703 100644
--- a/src/guichan/widgets/dropdown.cpp
+++ b/src/guichan/widgets/dropdown.cpp
@@ -436,7 +436,7 @@ namespace gcn
}
}
- void DropDown::focusLost(const Event& event _UNUSED_)
+ void DropDown::focusLost(const Event& event A_UNUSED)
{
foldUp();
mInternalFocusHandler.focusNone();
@@ -451,7 +451,7 @@ namespace gcn
BasicContainer::death(event);
}
- void DropDown::action(const ActionEvent& actionEvent _UNUSED_)
+ void DropDown::action(const ActionEvent& actionEvent A_UNUSED)
{
foldUp();
releaseModalMouseInputFocus();
@@ -543,7 +543,7 @@ namespace gcn
mListBox->setSelectionColor(color);
}
- void DropDown::valueChanged(const SelectionEvent& event _UNUSED_)
+ void DropDown::valueChanged(const SelectionEvent& event A_UNUSED)
{
distributeValueChangedEvent();
}
diff --git a/src/guichan/widgets/tab.cpp b/src/guichan/widgets/tab.cpp
index 61efbd5b0..1a3df3ede 100644
--- a/src/guichan/widgets/tab.cpp
+++ b/src/guichan/widgets/tab.cpp
@@ -168,12 +168,12 @@ namespace gcn
graphics->popClipArea();
}
- void Tab::mouseEntered(MouseEvent& mouseEvent _UNUSED_)
+ void Tab::mouseEntered(MouseEvent& mouseEvent A_UNUSED)
{
mHasMouse = true;
}
- void Tab::mouseExited(MouseEvent& mouseEvent _UNUSED_)
+ void Tab::mouseExited(MouseEvent& mouseEvent A_UNUSED)
{
mHasMouse = false;
}
diff --git a/src/guichan/widgets/window.cpp b/src/guichan/widgets/window.cpp
index a26c38541..4779fb0ce 100644
--- a/src/guichan/widgets/window.cpp
+++ b/src/guichan/widgets/window.cpp
@@ -230,7 +230,7 @@ namespace gcn
mMoved = mouseEvent.getY() <= (int)mTitleBarHeight;
}
- void Window::mouseReleased(MouseEvent& mouseEvent _UNUSED_)
+ void Window::mouseReleased(MouseEvent& mouseEvent A_UNUSED)
{
mMoved = false;
}
diff --git a/src/imagesprite.h b/src/imagesprite.h
index 914a54365..21705c812 100644
--- a/src/imagesprite.h
+++ b/src/imagesprite.h
@@ -23,9 +23,9 @@
#define IMAGESPRITE_H
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
#include "sprite.h"
@@ -44,10 +44,10 @@ public:
bool reset()
{ return false; }
- bool play(std::string action _UNUSED_)
+ bool play(std::string action A_UNUSED)
{ return false; }
- bool update(int time _UNUSED_)
+ bool update(int time A_UNUSED)
{ return false; }
bool draw(Graphics* graphics, int posX, int posY) const;
@@ -61,7 +61,7 @@ public:
const Image* getImage() const
{ return mImage; }
- virtual bool setSpriteDirection(SpriteDirection direction _UNUSED_)
+ virtual bool setSpriteDirection(SpriteDirection direction A_UNUSED)
{ return false; }
int getNumberOfLayers()
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 49a475122..861bfb642 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -797,7 +797,7 @@ Position LocalPlayer::getNextWalkPosition(unsigned char dir)
return Position(static_cast<int>(pos.x), static_cast<int>(pos.y));
}
-void LocalPlayer::nextTile(unsigned char dir _UNUSED_ = 0)
+void LocalPlayer::nextTile(unsigned char dir A_UNUSED = 0)
{
#ifdef MANASERV_SUPPORT
if (Net::getNetworkType() != ServerInfo::MANASERV)
diff --git a/src/localplayer.h b/src/localplayer.h
index d067237e1..3a97511f5 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -37,9 +37,9 @@
#include <vector>
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
class ChatTab;
diff --git a/src/log.h b/src/log.h
index 576a36956..b8517f696 100644
--- a/src/log.h
+++ b/src/log.h
@@ -20,8 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _LOG_H
-#define _LOG_H
+#ifndef M_LOG_H
+#define M_LOG_H
#include "main.h"
#include <fstream>
diff --git a/src/main.cpp b/src/main.cpp
index 5f565a091..faeedadaa 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -211,7 +211,7 @@ static void initInternationalization()
#endif
}
-static void xmlNullLogger(void *ctx _UNUSED_, const char *msg _UNUSED_, ...)
+static void xmlNullLogger(void *ctx A_UNUSED, const char *msg A_UNUSED, ...)
{
// Does nothing, that's the whole point of it
}
diff --git a/src/main.h b/src/main.h
index 40b555221..46e198790 100644
--- a/src/main.h
+++ b/src/main.h
@@ -106,9 +106,9 @@
#endif
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
#endif
diff --git a/src/map.h b/src/map.h
index e33a9a35c..d7b642adc 100644
--- a/src/map.h
+++ b/src/map.h
@@ -33,9 +33,9 @@
#include <vector>
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
class Animation;
diff --git a/src/net/download.cpp b/src/net/download.cpp
index 59f6edd9c..c93f33c21 100644
--- a/src/net/download.cpp
+++ b/src/net/download.cpp
@@ -168,7 +168,7 @@ char *Download::getError()
}
int Download::downloadProgress(void *clientp, double dltotal, double dlnow,
- double ultotal _UNUSED_, double ulnow _UNUSED_)
+ double ultotal A_UNUSED, double ulnow A_UNUSED)
{
Download *d = reinterpret_cast<Download*>(clientp);
if (!d)
diff --git a/src/net/download.h b/src/net/download.h
index 71bb41cee..12c0c07d7 100644
--- a/src/net/download.h
+++ b/src/net/download.h
@@ -29,9 +29,9 @@
#include <string>
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
enum DownloadStatus
diff --git a/src/net/ea/adminhandler.cpp b/src/net/ea/adminhandler.cpp
index 3554a9d9e..5440d14d0 100644
--- a/src/net/ea/adminhandler.cpp
+++ b/src/net/ea/adminhandler.cpp
@@ -37,7 +37,7 @@ void AdminHandler::kick(const std::string &name)
Net::getChatHandler()->talk("@kick " + name);
}
-void AdminHandler::ban(int playerId _UNUSED_)
+void AdminHandler::ban(int playerId A_UNUSED)
{
// Not supported
}
@@ -47,7 +47,7 @@ void AdminHandler::ban(const std::string &name)
Net::getChatHandler()->talk("@ban " + name);
}
-void AdminHandler::unban(int playerId _UNUSED_)
+void AdminHandler::unban(int playerId A_UNUSED)
{
// Not supported
}
@@ -57,8 +57,8 @@ void AdminHandler::unban(const std::string &name)
Net::getChatHandler()->talk("@unban " + name);
}
-void AdminHandler::mute(int playerId _UNUSED_, int type _UNUSED_,
- int limit _UNUSED_)
+void AdminHandler::mute(int playerId A_UNUSED, int type A_UNUSED,
+ int limit A_UNUSED)
{
return; // Still looking into this
}
diff --git a/src/net/ea/adminhandler.h b/src/net/ea/adminhandler.h
index 67b5cdc11..6f77c0e18 100644
--- a/src/net/ea/adminhandler.h
+++ b/src/net/ea/adminhandler.h
@@ -27,9 +27,9 @@
#include "net/net.h"
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
namespace Ea
diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp
index 2da19ad36..c6606fda8 100644
--- a/src/net/ea/beinghandler.cpp
+++ b/src/net/ea/beinghandler.cpp
@@ -717,7 +717,7 @@ void BeingHandler::processPlayerStop(Net::MessageIn &msg)
}
}
-void BeingHandler::processPlayerMoveToAttack(Net::MessageIn &msg _UNUSED_)
+void BeingHandler::processPlayerMoveToAttack(Net::MessageIn &msg A_UNUSED)
{
/*
* This is an *advisory* message, telling the client that
diff --git a/src/net/ea/beinghandler.h b/src/net/ea/beinghandler.h
index e76cf7840..f3769943d 100644
--- a/src/net/ea/beinghandler.h
+++ b/src/net/ea/beinghandler.h
@@ -27,9 +27,9 @@
#include "net/net.h"
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
namespace Ea
diff --git a/src/net/manaserv/adminhandler.cpp b/src/net/manaserv/adminhandler.cpp
index c4d4e06a2..72e7c7ca8 100644
--- a/src/net/manaserv/adminhandler.cpp
+++ b/src/net/manaserv/adminhandler.cpp
@@ -45,48 +45,48 @@ void AdminHandler::announce(const std::string &text)
chatServerConnection->send(msg);
}
-void AdminHandler::localAnnounce(const std::string &text _UNUSED_)
+void AdminHandler::localAnnounce(const std::string &text A_UNUSED)
{
// TODO
}
-void AdminHandler::hide(bool hide _UNUSED_)
+void AdminHandler::hide(bool hide A_UNUSED)
{
// TODO
}
-void AdminHandler::kick(int playerId _UNUSED_)
+void AdminHandler::kick(int playerId A_UNUSED)
{
// TODO
}
-void AdminHandler::kick(const std::string &name _UNUSED_)
+void AdminHandler::kick(const std::string &name A_UNUSED)
{
// TODO
}
-void AdminHandler::ban(int playerId _UNUSED_)
+void AdminHandler::ban(int playerId A_UNUSED)
{
// TODO
}
-void AdminHandler::ban(const std::string &name _UNUSED_)
+void AdminHandler::ban(const std::string &name A_UNUSED)
{
// TODO
}
-void AdminHandler::unban(int playerId _UNUSED_)
+void AdminHandler::unban(int playerId A_UNUSED)
{
// TODO
}
-void AdminHandler::unban(const std::string &name _UNUSED_)
+void AdminHandler::unban(const std::string &name A_UNUSED)
{
// TODO
}
-void AdminHandler::mute(int playerId _UNUSED_, int type _UNUSED_,
- int limit _UNUSED_)
+void AdminHandler::mute(int playerId A_UNUSED, int type A_UNUSED,
+ int limit A_UNUSED)
{
// TODO
}
diff --git a/src/net/manaserv/adminhandler.h b/src/net/manaserv/adminhandler.h
index 6f3d8146b..a91841085 100644
--- a/src/net/manaserv/adminhandler.h
+++ b/src/net/manaserv/adminhandler.h
@@ -26,9 +26,9 @@
#include "net/adminhandler.h"
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
namespace ManaServ
diff --git a/src/net/manaserv/beinghandler.cpp b/src/net/manaserv/beinghandler.cpp
index 578b947f2..23aae1f56 100644
--- a/src/net/manaserv/beinghandler.cpp
+++ b/src/net/manaserv/beinghandler.cpp
@@ -376,11 +376,11 @@ void BeingHandler::handleBeingDirChangeMessage(Net::MessageIn &msg)
}
}
-void BeingHandler::requestNameById(int id _UNUSED_)
+void BeingHandler::requestNameById(int id A_UNUSED)
{
}
-void BeingHandler::undress(Being *being _UNUSED_)
+void BeingHandler::undress(Being *being A_UNUSED)
{
}
diff --git a/src/net/manaserv/beinghandler.h b/src/net/manaserv/beinghandler.h
index 0a1e32f48..512d3e58f 100644
--- a/src/net/manaserv/beinghandler.h
+++ b/src/net/manaserv/beinghandler.h
@@ -31,9 +31,9 @@
#include "map.h"
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
namespace ManaServ
diff --git a/src/net/manaserv/buysellhandler.cpp b/src/net/manaserv/buysellhandler.cpp
index 97ec36654..7cc0e70f2 100644
--- a/src/net/manaserv/buysellhandler.cpp
+++ b/src/net/manaserv/buysellhandler.cpp
@@ -107,26 +107,26 @@ void BuySellHandler::handleMessage(Net::MessageIn &msg)
}
}
-void BuySellHandler::requestSellList(std::string nick _UNUSED_)
+void BuySellHandler::requestSellList(std::string nick A_UNUSED)
{
// TODO
}
-void BuySellHandler::requestBuyList(std::string nick _UNUSED_)
+void BuySellHandler::requestBuyList(std::string nick A_UNUSED)
{
// TODO
}
-void BuySellHandler::sendBuyRequest(std::string nick _UNUSED_,
- ShopItem* item _UNUSED_,
- int amount _UNUSED_)
+void BuySellHandler::sendBuyRequest(std::string nick A_UNUSED,
+ ShopItem* item A_UNUSED,
+ int amount A_UNUSED)
{
// TODO
}
-void BuySellHandler::sendSellRequest(std::string nick _UNUSED_,
- ShopItem* item _UNUSED_,
- int amount _UNUSED_)
+void BuySellHandler::sendSellRequest(std::string nick A_UNUSED,
+ ShopItem* item A_UNUSED,
+ int amount A_UNUSED)
{
// TODO
}
diff --git a/src/net/manaserv/buysellhandler.h b/src/net/manaserv/buysellhandler.h
index f927b195a..b38fdd9e7 100644
--- a/src/net/manaserv/buysellhandler.h
+++ b/src/net/manaserv/buysellhandler.h
@@ -28,9 +28,9 @@
#include "net/buysellhandler.h"
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
namespace ManaServ
diff --git a/src/net/manaserv/chathandler.cpp b/src/net/manaserv/chathandler.cpp
index 9fc85be2d..85323b11a 100644
--- a/src/net/manaserv/chathandler.cpp
+++ b/src/net/manaserv/chathandler.cpp
@@ -384,7 +384,7 @@ void ChatHandler::talkRaw(const std::string &text)
gameServerConnection->send(msg);
}
-void ChatHandler::me(const std::string &text _UNUSED_)
+void ChatHandler::me(const std::string &text A_UNUSED)
{
// TODO
}
@@ -466,7 +466,7 @@ void ChatHandler::who()
chatServerConnection->send(msg);
}
-void ChatHandler::sendRaw(const std::string &args _UNUSED_)
+void ChatHandler::sendRaw(const std::string &args A_UNUSED)
{
}
diff --git a/src/net/manaserv/chathandler.h b/src/net/manaserv/chathandler.h
index 7eb3f133f..5eb2a0ff4 100644
--- a/src/net/manaserv/chathandler.h
+++ b/src/net/manaserv/chathandler.h
@@ -29,9 +29,9 @@
#include "net/manaserv/messagehandler.h"
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
namespace ManaServ
diff --git a/src/net/manaserv/gamehandler.cpp b/src/net/manaserv/gamehandler.cpp
index 97ea56eb1..21bd526d8 100644
--- a/src/net/manaserv/gamehandler.cpp
+++ b/src/net/manaserv/gamehandler.cpp
@@ -131,7 +131,7 @@ void GameHandler::quit(bool reconnectAccount)
gameServerConnection->send(msg);
}
-void GameHandler::ping(int tick _UNUSED_)
+void GameHandler::ping(int tick A_UNUSED)
{
// TODO
}
diff --git a/src/net/manaserv/gamehandler.h b/src/net/manaserv/gamehandler.h
index 788d2dd8d..a38052205 100644
--- a/src/net/manaserv/gamehandler.h
+++ b/src/net/manaserv/gamehandler.h
@@ -29,9 +29,9 @@
#include "net/manaserv/messagehandler.h"
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
namespace ManaServ
diff --git a/src/net/manaserv/generalhandler.h b/src/net/manaserv/generalhandler.h
index 17e45947a..90587eeb3 100644
--- a/src/net/manaserv/generalhandler.h
+++ b/src/net/manaserv/generalhandler.h
@@ -31,9 +31,9 @@
#include "net/manaserv/messagehandler.h"
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
namespace ManaServ
diff --git a/src/net/manaserv/guildhandler.cpp b/src/net/manaserv/guildhandler.cpp
index f074152d6..354b96762 100644
--- a/src/net/manaserv/guildhandler.cpp
+++ b/src/net/manaserv/guildhandler.cpp
@@ -286,7 +286,7 @@ void GuildHandler::invite(int guildId, Being *being)
invite(guildId, being->getName());
}
-void GuildHandler::inviteResponse(int guildId _UNUSED_, bool response _UNUSED_)
+void GuildHandler::inviteResponse(int guildId A_UNUSED, bool response A_UNUSED)
{
/*MessageOut msg(PCMSG_GUILD_ACCEPT);
msg.writeString(name);
@@ -300,13 +300,13 @@ void GuildHandler::leave(int guildId)
chatServerConnection->send(msg);
}
-void GuildHandler::kick(GuildMember *member _UNUSED_,
- std::string reason _UNUSED_)
+void GuildHandler::kick(GuildMember *member A_UNUSED,
+ std::string reason A_UNUSED)
{
// TODO
}
-void GuildHandler::chat(int guildId _UNUSED_, const std::string &text _UNUSED_)
+void GuildHandler::chat(int guildId A_UNUSED, const std::string &text A_UNUSED)
{
// TODO
}
@@ -318,13 +318,13 @@ void GuildHandler::memberList(int guildId)
chatServerConnection->send(msg);
}
-void GuildHandler::info(int guildId _UNUSED_)
+void GuildHandler::info(int guildId A_UNUSED)
{
// TODO
}
-void GuildHandler::changeMemberPostion(GuildMember *member _UNUSED_,
- int level _UNUSED_)
+void GuildHandler::changeMemberPostion(GuildMember *member A_UNUSED,
+ int level A_UNUSED)
{
/*MessageOut msg(PCMSG_GUILD_PROMOTE_MEMBER);
msg.writeInt16(guildId);
@@ -333,27 +333,27 @@ void GuildHandler::changeMemberPostion(GuildMember *member _UNUSED_,
chatServerConnection->send(msg);*/
}
-void GuildHandler::requestAlliance(int guildId _UNUSED_,
- int otherGuildId _UNUSED_)
+void GuildHandler::requestAlliance(int guildId A_UNUSED,
+ int otherGuildId A_UNUSED)
{
// TODO
}
-void GuildHandler::requestAllianceResponse(int guildId _UNUSED_,
- int otherGuildId _UNUSED_,
- bool response _UNUSED_)
+void GuildHandler::requestAllianceResponse(int guildId A_UNUSED,
+ int otherGuildId A_UNUSED,
+ bool response A_UNUSED)
{
// TODO
}
-void GuildHandler::endAlliance(int guildId _UNUSED_, int otherGuildId _UNUSED_)
+void GuildHandler::endAlliance(int guildId A_UNUSED, int otherGuildId A_UNUSED)
{
// TODO
}
-void GuildHandler::changeNotice(int guildId _UNUSED_,
- std::string msg1 _UNUSED_,
- std::string msg2 _UNUSED_)
+void GuildHandler::changeNotice(int guildId A_UNUSED,
+ std::string msg1 A_UNUSED,
+ std::string msg2 A_UNUSED)
{
// TODO
}
diff --git a/src/net/manaserv/guildhandler.h b/src/net/manaserv/guildhandler.h
index 7bf3cbce5..11fc2dfdb 100644
--- a/src/net/manaserv/guildhandler.h
+++ b/src/net/manaserv/guildhandler.h
@@ -28,9 +28,9 @@
#include "net/manaserv/messagehandler.h"
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
namespace ManaServ
@@ -62,7 +62,7 @@ public:
void memberList(int guildId);
- void info(int guildId _UNUSED_);
+ void info(int guildId A_UNUSED);
void changeMemberPostion(GuildMember *member, int level);
diff --git a/src/net/manaserv/inventoryhandler.cpp b/src/net/manaserv/inventoryhandler.cpp
index 111eee944..75823be51 100644
--- a/src/net/manaserv/inventoryhandler.cpp
+++ b/src/net/manaserv/inventoryhandler.cpp
@@ -182,18 +182,18 @@ void InventoryHandler::moveItem(int oldIndex, int newIndex)
gameServerConnection->send(msg);
}
-void InventoryHandler::openStorage(int type _UNUSED_)
+void InventoryHandler::openStorage(int type A_UNUSED)
{
// TODO
}
-void InventoryHandler::closeStorage(int type _UNUSED_)
+void InventoryHandler::closeStorage(int type A_UNUSED)
{
// TODO
}
-void InventoryHandler::moveItem(int source _UNUSED_, int slot _UNUSED_,
- int amount _UNUSED_, int destination _UNUSED_)
+void InventoryHandler::moveItem(int source A_UNUSED, int slot A_UNUSED,
+ int amount A_UNUSED, int destination A_UNUSED)
{
// TODO
}
diff --git a/src/net/manaserv/inventoryhandler.h b/src/net/manaserv/inventoryhandler.h
index a4b91ca31..6b24699b0 100644
--- a/src/net/manaserv/inventoryhandler.h
+++ b/src/net/manaserv/inventoryhandler.h
@@ -30,9 +30,9 @@
#include "net/manaserv/messagehandler.h"
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
namespace ManaServ
diff --git a/src/net/manaserv/loginhandler.cpp b/src/net/manaserv/loginhandler.cpp
index d9b36d461..e6109ca28 100644
--- a/src/net/manaserv/loginhandler.cpp
+++ b/src/net/manaserv/loginhandler.cpp
@@ -437,7 +437,7 @@ void LoginHandler::changePassword(const std::string &username,
accountServerConnection->send(msg);
}
-void LoginHandler::chooseServer(unsigned int server _UNUSED_)
+void LoginHandler::chooseServer(unsigned int server A_UNUSED)
{
// TODO
}
diff --git a/src/net/manaserv/loginhandler.h b/src/net/manaserv/loginhandler.h
index a13bbb33e..e60f00d92 100644
--- a/src/net/manaserv/loginhandler.h
+++ b/src/net/manaserv/loginhandler.h
@@ -29,9 +29,9 @@
#include "net/manaserv/messagehandler.h"
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
class LoginData;
diff --git a/src/net/manaserv/npchandler.cpp b/src/net/manaserv/npchandler.cpp
index 2c389bc7d..efd2ab2bc 100644
--- a/src/net/manaserv/npchandler.cpp
+++ b/src/net/manaserv/npchandler.cpp
@@ -185,7 +185,7 @@ void NpcHandler::stringInput(int npcId, const std::string &value)
gameServerConnection->send(msg);
}
-void NpcHandler::sendLetter(int npcId _UNUSED_, const std::string &recipient,
+void NpcHandler::sendLetter(int npcId A_UNUSED, const std::string &recipient,
const std::string &text)
{
MessageOut msg(PGMSG_NPC_POST_SEND);
@@ -194,23 +194,23 @@ void NpcHandler::sendLetter(int npcId _UNUSED_, const std::string &recipient,
gameServerConnection->send(msg);
}
-void NpcHandler::startShopping(int beingId _UNUSED_)
+void NpcHandler::startShopping(int beingId A_UNUSED)
{
// TODO
}
-void NpcHandler::buy(int beingId _UNUSED_)
+void NpcHandler::buy(int beingId A_UNUSED)
{
// TODO
}
-void NpcHandler::sell(int beingId _UNUSED_)
+void NpcHandler::sell(int beingId A_UNUSED)
{
// TODO
}
-void NpcHandler::buyItem(int beingId _UNUSED_, int itemId,
- unsigned char color _UNUSED_, int amount)
+void NpcHandler::buyItem(int beingId A_UNUSED, int itemId,
+ unsigned char color A_UNUSED, int amount)
{
MessageOut msg(PGMSG_NPC_BUYSELL);
msg.writeInt16(itemId);
@@ -218,7 +218,7 @@ void NpcHandler::buyItem(int beingId _UNUSED_, int itemId,
gameServerConnection->send(msg);
}
-void NpcHandler::sellItem(int beingId _UNUSED_, int itemId, int amount)
+void NpcHandler::sellItem(int beingId A_UNUSED, int itemId, int amount)
{
MessageOut msg(PGMSG_NPC_BUYSELL);
msg.writeInt16(itemId);
@@ -226,7 +226,7 @@ void NpcHandler::sellItem(int beingId _UNUSED_, int itemId, int amount)
gameServerConnection->send(msg);
}
-void NpcHandler::endShopping(int beingId _UNUSED_)
+void NpcHandler::endShopping(int beingId A_UNUSED)
{
// TODO
}
diff --git a/src/net/manaserv/npchandler.h b/src/net/manaserv/npchandler.h
index 6ecfb4e97..f48e92ecb 100644
--- a/src/net/manaserv/npchandler.h
+++ b/src/net/manaserv/npchandler.h
@@ -30,9 +30,9 @@
#include <map>
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
class NpcDialog;
diff --git a/src/net/manaserv/partyhandler.cpp b/src/net/manaserv/partyhandler.cpp
index 1c0fdb14f..b3d69e826 100644
--- a/src/net/manaserv/partyhandler.cpp
+++ b/src/net/manaserv/partyhandler.cpp
@@ -130,12 +130,12 @@ void PartyHandler::handleMessage(Net::MessageIn &msg)
}
}
-void PartyHandler::create(const std::string &name _UNUSED_)
+void PartyHandler::create(const std::string &name A_UNUSED)
{
// TODO
}
-void PartyHandler::join(int partyId _UNUSED_)
+void PartyHandler::join(int partyId A_UNUSED)
{
// TODO
}
@@ -171,17 +171,17 @@ void PartyHandler::leave()
chatServerConnection->send(msg);
}
-void PartyHandler::kick(Being *being _UNUSED_)
+void PartyHandler::kick(Being *being A_UNUSED)
{
// TODO
}
-void PartyHandler::kick(const std::string &name _UNUSED_)
+void PartyHandler::kick(const std::string &name A_UNUSED)
{
// TODO
}
-void PartyHandler::chat(const std::string &text _UNUSED_)
+void PartyHandler::chat(const std::string &text A_UNUSED)
{
// TODO
}
diff --git a/src/net/manaserv/partyhandler.h b/src/net/manaserv/partyhandler.h
index cbdfc5e9f..45cc39e05 100644
--- a/src/net/manaserv/partyhandler.h
+++ b/src/net/manaserv/partyhandler.h
@@ -32,9 +32,9 @@
#include <string>
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
namespace ManaServ
@@ -69,11 +69,11 @@ public:
PartyShare getShareExperience() { return PARTY_SHARE_NO; }
- void setShareExperience(PartyShare share _UNUSED_) {}
+ void setShareExperience(PartyShare share A_UNUSED) {}
PartyShare getShareItems() { return PARTY_SHARE_NO; }
- void setShareItems(PartyShare share _UNUSED_) {}
+ void setShareItems(PartyShare share A_UNUSED) {}
private:
Party *mParty;
};
diff --git a/src/net/manaserv/playerhandler.cpp b/src/net/manaserv/playerhandler.cpp
index 54d6dc7de..5ac058b7e 100644
--- a/src/net/manaserv/playerhandler.cpp
+++ b/src/net/manaserv/playerhandler.cpp
@@ -60,7 +60,7 @@ extern Net::PlayerHandler *playerHandler;
namespace ManaServ
{
-void RespawnRequestListener::action(const gcn::ActionEvent &event _UNUSED_)
+void RespawnRequestListener::action(const gcn::ActionEvent &event A_UNUSED)
{
Net::getPlayerHandler()->respawn();
@@ -328,7 +328,7 @@ void PlayerHandler::handleMapChangeMessage(Net::MessageIn &msg)
viewport->scrollBy(scrollOffsetX, scrollOffsetY);
}
-void PlayerHandler::attack(int id, bool keep _UNUSED_)
+void PlayerHandler::attack(int id, bool keep A_UNUSED)
{
MessageOut msg(PGMSG_ATTACK);
msg.writeInt16(id);
@@ -340,7 +340,7 @@ void PlayerHandler::stopAttack()
}
-void PlayerHandler::emote(Uint8 emoteId _UNUSED_)
+void PlayerHandler::emote(Uint8 emoteId A_UNUSED)
{
// TODO
}
@@ -359,7 +359,7 @@ void PlayerHandler::decreaseAttribute(int attr)
gameServerConnection->send(msg);
}
-void PlayerHandler::increaseSkill(unsigned short skillId _UNUSED_)
+void PlayerHandler::increaseSkill(unsigned short skillId A_UNUSED)
{
// Not used atm
}
@@ -406,13 +406,13 @@ void PlayerHandler::respawn()
gameServerConnection->send(msg);
}
-void PlayerHandler::ignorePlayer(const std::string &player _UNUSED_,
- bool ignore _UNUSED_)
+void PlayerHandler::ignorePlayer(const std::string &player A_UNUSED,
+ bool ignore A_UNUSED)
{
// TODO
}
-void PlayerHandler::ignoreAll(bool ignore _UNUSED_)
+void PlayerHandler::ignoreAll(bool ignore A_UNUSED)
{
// TODO
}
diff --git a/src/net/manaserv/playerhandler.h b/src/net/manaserv/playerhandler.h
index 79909d31c..2460877ec 100644
--- a/src/net/manaserv/playerhandler.h
+++ b/src/net/manaserv/playerhandler.h
@@ -30,9 +30,9 @@
#include <guichan/actionlistener.hpp>
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
namespace ManaServ
diff --git a/src/net/manaserv/specialhandler.cpp b/src/net/manaserv/specialhandler.cpp
index 7dfcbb9cc..4f99368bc 100644
--- a/src/net/manaserv/specialhandler.cpp
+++ b/src/net/manaserv/specialhandler.cpp
@@ -39,7 +39,7 @@ SpecialHandler::SpecialHandler()
specialHandler = this;
}
-void SpecialHandler::handleMessage(Net::MessageIn &msg _UNUSED_)
+void SpecialHandler::handleMessage(Net::MessageIn &msg A_UNUSED)
{
// TODO
}
@@ -51,19 +51,19 @@ void SpecialHandler::use(int id)
gameServerConnection->send(msg);
}
-void SpecialHandler::use(int id _UNUSED_, int level _UNUSED_,
- int beingId _UNUSED_)
+void SpecialHandler::use(int id A_UNUSED, int level A_UNUSED,
+ int beingId A_UNUSED)
{
// TODO
}
-void SpecialHandler::use(int id _UNUSED_, int level _UNUSED_, int x _UNUSED_,
- int y _UNUSED_)
+void SpecialHandler::use(int id A_UNUSED, int level A_UNUSED, int x _UNUSED_,
+ int y A_UNUSED)
{
// TODO
}
-void SpecialHandler::use(int id _UNUSED_, const std::string &map _UNUSED_)
+void SpecialHandler::use(int id A_UNUSED, const std::string &map A_UNUSED)
{
// TODO
}
diff --git a/src/net/manaserv/specialhandler.h b/src/net/manaserv/specialhandler.h
index cc3368e96..e7931f8ea 100644
--- a/src/net/manaserv/specialhandler.h
+++ b/src/net/manaserv/specialhandler.h
@@ -28,9 +28,9 @@
#include "net/manaserv/messagehandler.h"
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
namespace ManaServ
diff --git a/src/net/manaserv/tradehandler.cpp b/src/net/manaserv/tradehandler.cpp
index 5c91b5457..be38e4019 100644
--- a/src/net/manaserv/tradehandler.cpp
+++ b/src/net/manaserv/tradehandler.cpp
@@ -205,7 +205,7 @@ void TradeHandler::addItem(Item *item, int amount)
item->increaseQuantity(-amount);
}
-void TradeHandler::removeItem(int slotNum _UNUSED_, int amount _UNUSED_)
+void TradeHandler::removeItem(int slotNum A_UNUSED, int amount A_UNUSED)
{
// TODO
}
diff --git a/src/net/manaserv/tradehandler.h b/src/net/manaserv/tradehandler.h
index 10f8fc9e8..35c260a8e 100644
--- a/src/net/manaserv/tradehandler.h
+++ b/src/net/manaserv/tradehandler.h
@@ -28,9 +28,9 @@
#include "net/manaserv/messagehandler.h"
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
namespace ManaServ
diff --git a/src/net/messageout.cpp b/src/net/messageout.cpp
index 24edb4079..3cdcb42e0 100644
--- a/src/net/messageout.cpp
+++ b/src/net/messageout.cpp
@@ -36,7 +36,7 @@
namespace Net
{
-MessageOut::MessageOut(short id _UNUSED_):
+MessageOut::MessageOut(short id A_UNUSED):
mData(0),
mDataSize(0),
mPos(0)
diff --git a/src/net/messageout.h b/src/net/messageout.h
index 433fb73a2..3da92ab28 100644
--- a/src/net/messageout.h
+++ b/src/net/messageout.h
@@ -28,9 +28,9 @@
#include <iosfwd>
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
namespace Net
diff --git a/src/net/tmwa/adminhandler.cpp b/src/net/tmwa/adminhandler.cpp
index cbd16bd39..a0d996dbf 100644
--- a/src/net/tmwa/adminhandler.cpp
+++ b/src/net/tmwa/adminhandler.cpp
@@ -89,7 +89,7 @@ void AdminHandler::localAnnounce(const std::string &text)
outMsg.writeString(text, static_cast<int>(text.length()));
}
-void AdminHandler::hide(bool hide _UNUSED_)
+void AdminHandler::hide(bool hide A_UNUSED)
{
MessageOut outMsg(CMSG_ADMIN_HIDE);
outMsg.writeInt32(0); //unused
diff --git a/src/net/tmwa/adminhandler.h b/src/net/tmwa/adminhandler.h
index 6c60398fc..79f41dece 100644
--- a/src/net/tmwa/adminhandler.h
+++ b/src/net/tmwa/adminhandler.h
@@ -31,9 +31,9 @@
#include "net/tmwa/messagehandler.h"
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
namespace TmwAthena
diff --git a/src/net/tmwa/charserverhandler.cpp b/src/net/tmwa/charserverhandler.cpp
index defe7925a..0a28a9a8c 100644
--- a/src/net/tmwa/charserverhandler.cpp
+++ b/src/net/tmwa/charserverhandler.cpp
@@ -409,7 +409,7 @@ void CharServerHandler::chooseCharacter(Net::Character *character)
}
void CharServerHandler::newCharacter(const std::string &name, int slot,
- bool gender _UNUSED_, int hairstyle,
+ bool gender A_UNUSED, int hairstyle,
int hairColor, unsigned char race,
const std::vector<int> &stats)
{
diff --git a/src/net/tmwa/charserverhandler.h b/src/net/tmwa/charserverhandler.h
index 7e843ffec..62ff2b4de 100644
--- a/src/net/tmwa/charserverhandler.h
+++ b/src/net/tmwa/charserverhandler.h
@@ -30,9 +30,9 @@
#include "net/tmwa/token.h"
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
class LoginData;
diff --git a/src/net/tmwa/chathandler.cpp b/src/net/tmwa/chathandler.cpp
index b4ae395c3..c9862cd53 100644
--- a/src/net/tmwa/chathandler.cpp
+++ b/src/net/tmwa/chathandler.cpp
@@ -395,43 +395,43 @@ void ChatHandler::channelList()
SERVER_NOTICE(_("Channels are not supported!"))
}
-void ChatHandler::enterChannel(const std::string &channel _UNUSED_,
- const std::string &password _UNUSED_)
+void ChatHandler::enterChannel(const std::string &channel A_UNUSED,
+ const std::string &password A_UNUSED)
{
SERVER_NOTICE(_("Channels are not supported!"))
}
-void ChatHandler::quitChannel(int channelId _UNUSED_)
+void ChatHandler::quitChannel(int channelId A_UNUSED)
{
SERVER_NOTICE(_("Channels are not supported!"))
}
-void ChatHandler::sendToChannel(int channelId _UNUSED_,
- const std::string &text _UNUSED_)
+void ChatHandler::sendToChannel(int channelId A_UNUSED,
+ const std::string &text A_UNUSED)
{
SERVER_NOTICE(_("Channels are not supported!"))
}
-void ChatHandler::userList(const std::string &channel _UNUSED_)
+void ChatHandler::userList(const std::string &channel A_UNUSED)
{
SERVER_NOTICE(_("Channels are not supported!"))
}
-void ChatHandler::setChannelTopic(int channelId _UNUSED_,
- const std::string &text _UNUSED_)
+void ChatHandler::setChannelTopic(int channelId A_UNUSED,
+ const std::string &text A_UNUSED)
{
SERVER_NOTICE(_("Channels are not supported!"))
}
-void ChatHandler::setUserMode(int channelId _UNUSED_,
- const std::string &name _UNUSED_,
- int mode _UNUSED_)
+void ChatHandler::setUserMode(int channelId A_UNUSED,
+ const std::string &name A_UNUSED,
+ int mode A_UNUSED)
{
SERVER_NOTICE(_("Channels are not supported!"))
}
-void ChatHandler::kickUser(int channelId _UNUSED_,
- const std::string &name _UNUSED_)
+void ChatHandler::kickUser(int channelId A_UNUSED,
+ const std::string &name A_UNUSED)
{
SERVER_NOTICE(_("Channels are not supported!"))
}
diff --git a/src/net/tmwa/chathandler.h b/src/net/tmwa/chathandler.h
index 1a48b0cd6..c1b1f26fa 100644
--- a/src/net/tmwa/chathandler.h
+++ b/src/net/tmwa/chathandler.h
@@ -31,9 +31,9 @@
#include <queue>
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
namespace TmwAthena
diff --git a/src/net/tmwa/gamehandler.h b/src/net/tmwa/gamehandler.h
index fbb623409..d6004054c 100644
--- a/src/net/tmwa/gamehandler.h
+++ b/src/net/tmwa/gamehandler.h
@@ -33,9 +33,9 @@
#include "net/tmwa/token.h"
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
namespace TmwAthena
diff --git a/src/net/tmwa/generalhandler.h b/src/net/tmwa/generalhandler.h
index bccde03cb..27186fcc8 100644
--- a/src/net/tmwa/generalhandler.h
+++ b/src/net/tmwa/generalhandler.h
@@ -31,9 +31,9 @@
#include "net/tmwa/messagehandler.h"
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
namespace TmwAthena
diff --git a/src/net/tmwa/guildhandler.cpp b/src/net/tmwa/guildhandler.cpp
index b70059baa..b6c230643 100644
--- a/src/net/tmwa/guildhandler.cpp
+++ b/src/net/tmwa/guildhandler.cpp
@@ -638,8 +638,8 @@ void GuildHandler::create(const std::string &name)
msg.writeString(name, 24);
}
-void GuildHandler::invite(int guildId _UNUSED_,
- const std::string &name _UNUSED_)
+void GuildHandler::invite(int guildId A_UNUSED,
+ const std::string &name A_UNUSED)
{
if (!actorSpriteManager)
return;
@@ -654,7 +654,7 @@ void GuildHandler::invite(int guildId _UNUSED_,
}
}
-void GuildHandler::invite(int guildId _UNUSED_, Being *being)
+void GuildHandler::invite(int guildId A_UNUSED, Being *being)
{
if (!being)
return;
@@ -698,7 +698,7 @@ void GuildHandler::kick(GuildMember *member, std::string reason)
msg.writeString(reason, 40); // Message
}
-void GuildHandler::chat(int guildId _UNUSED_, const std::string &text)
+void GuildHandler::chat(int guildId A_UNUSED, const std::string &text)
{
if (!player_node)
return;
@@ -709,7 +709,7 @@ void GuildHandler::chat(int guildId _UNUSED_, const std::string &text)
msg.writeString(str, static_cast<int>(str.length()));
}
-void GuildHandler::memberList(int guildId _UNUSED_)
+void GuildHandler::memberList(int guildId A_UNUSED)
{
// TODO four types of info requests:
// 0 = basic info + alliance info
@@ -722,7 +722,7 @@ void GuildHandler::memberList(int guildId _UNUSED_)
msg.writeInt32(1); // Request member list
}
-void GuildHandler::info(int guildId _UNUSED_)
+void GuildHandler::info(int guildId A_UNUSED)
{
// TODO four types of info requests:
// 0 = basic info + alliance info
@@ -748,20 +748,20 @@ void GuildHandler::changeMemberPostion(GuildMember *member, int level)
msg.writeInt32(level); // pos
}
-void GuildHandler::requestAlliance(int guildId _UNUSED_,
- int otherGuildId _UNUSED_)
+void GuildHandler::requestAlliance(int guildId A_UNUSED,
+ int otherGuildId A_UNUSED)
{
// TODO
}
-void GuildHandler::requestAllianceResponse(int guildId _UNUSED_,
- int otherGuildId _UNUSED_,
- bool response _UNUSED_)
+void GuildHandler::requestAllianceResponse(int guildId A_UNUSED,
+ int otherGuildId A_UNUSED,
+ bool response A_UNUSED)
{
// TODO
}
-void GuildHandler::endAlliance(int guildId _UNUSED_, int otherGuildId _UNUSED_)
+void GuildHandler::endAlliance(int guildId A_UNUSED, int otherGuildId A_UNUSED)
{
// TODO
}
diff --git a/src/net/tmwa/guildhandler.h b/src/net/tmwa/guildhandler.h
index 3171932c9..f429213a0 100644
--- a/src/net/tmwa/guildhandler.h
+++ b/src/net/tmwa/guildhandler.h
@@ -27,9 +27,9 @@
#include "net/tmwa/messagehandler.h"
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
namespace TmwAthena
@@ -60,7 +60,7 @@ class GuildHandler : public Net::GuildHandler, public MessageHandler
void memberList(int guildId);
- void info(int guildId _UNUSED_);
+ void info(int guildId A_UNUSED);
void changeMemberPostion(GuildMember *member, int level);
diff --git a/src/net/tmwa/inventoryhandler.cpp b/src/net/tmwa/inventoryhandler.cpp
index cc4ecabbd..734c8403e 100644
--- a/src/net/tmwa/inventoryhandler.cpp
+++ b/src/net/tmwa/inventoryhandler.cpp
@@ -618,28 +618,28 @@ void InventoryHandler::dropItem(const Item *item, int amount)
outMsg.writeInt16(static_cast<Sint16>(amount));
}
-bool InventoryHandler::canSplit(const Item *item _UNUSED_)
+bool InventoryHandler::canSplit(const Item *item A_UNUSED)
{
return false;
}
-void InventoryHandler::splitItem(const Item *item _UNUSED_,
- int amount _UNUSED_)
+void InventoryHandler::splitItem(const Item *item A_UNUSED,
+ int amount A_UNUSED)
{
// Not implemented for eAthena (possible?)
}
-void InventoryHandler::moveItem(int oldIndex _UNUSED_, int newIndex _UNUSED_)
+void InventoryHandler::moveItem(int oldIndex A_UNUSED, int newIndex A_UNUSED)
{
// Not implemented for eAthena (possible?)
}
-void InventoryHandler::openStorage(int type _UNUSED_)
+void InventoryHandler::openStorage(int type A_UNUSED)
{
// Doesn't apply to eAthena, since opening happens through NPCs?
}
-void InventoryHandler::closeStorage(int type _UNUSED_)
+void InventoryHandler::closeStorage(int type A_UNUSED)
{
MessageOut outMsg(CMSG_CLOSE_STORAGE);
}
diff --git a/src/net/tmwa/inventoryhandler.h b/src/net/tmwa/inventoryhandler.h
index 4bc45cdb3..5866f9077 100644
--- a/src/net/tmwa/inventoryhandler.h
+++ b/src/net/tmwa/inventoryhandler.h
@@ -40,9 +40,9 @@
#include <queue>
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
namespace TmwAthena
diff --git a/src/net/tmwa/loginhandler.cpp b/src/net/tmwa/loginhandler.cpp
index b1af0900d..c7ec0984c 100644
--- a/src/net/tmwa/loginhandler.cpp
+++ b/src/net/tmwa/loginhandler.cpp
@@ -291,12 +291,12 @@ void LoginHandler::logout()
// TODO
}
-void LoginHandler::changeEmail(const std::string &email _UNUSED_)
+void LoginHandler::changeEmail(const std::string &email A_UNUSED)
{
// TODO
}
-void LoginHandler::changePassword(const std::string &username _UNUSED_,
+void LoginHandler::changePassword(const std::string &username A_UNUSED,
const std::string &oldPassword,
const std::string &newPassword)
{
@@ -331,8 +331,8 @@ void LoginHandler::registerAccount(LoginData *loginData)
sendLoginRegister(username, loginData->password);
}
-void LoginHandler::unregisterAccount(const std::string &username _UNUSED_,
- const std::string &password _UNUSED_)
+void LoginHandler::unregisterAccount(const std::string &username A_UNUSED,
+ const std::string &password A_UNUSED)
{
// TODO
}
diff --git a/src/net/tmwa/loginhandler.h b/src/net/tmwa/loginhandler.h
index 615e42107..8c6b48cc2 100644
--- a/src/net/tmwa/loginhandler.h
+++ b/src/net/tmwa/loginhandler.h
@@ -31,9 +31,9 @@
#include <string>
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
class LoginData;
diff --git a/src/net/tmwa/npchandler.cpp b/src/net/tmwa/npchandler.cpp
index eb347db44..69b4b880a 100644
--- a/src/net/tmwa/npchandler.cpp
+++ b/src/net/tmwa/npchandler.cpp
@@ -197,14 +197,14 @@ void NpcHandler::stringInput(int npcId, const std::string &value)
outMsg.writeInt8(0); // Prevent problems with string reading
}
-void NpcHandler::sendLetter(int npcId _UNUSED_,
- const std::string &recipient _UNUSED_,
- const std::string &text _UNUSED_)
+void NpcHandler::sendLetter(int npcId A_UNUSED,
+ const std::string &recipient A_UNUSED,
+ const std::string &text A_UNUSED)
{
// TODO
}
-void NpcHandler::startShopping(int beingId _UNUSED_)
+void NpcHandler::startShopping(int beingId A_UNUSED)
{
// TODO
}
@@ -223,7 +223,7 @@ void NpcHandler::sell(int beingId)
outMsg.writeInt8(1); // Sell
}
-void NpcHandler::buyItem(int beingId _UNUSED_, int itemId,
+void NpcHandler::buyItem(int beingId A_UNUSED, int itemId,
unsigned char color, int amount)
{
MessageOut outMsg(CMSG_NPC_BUY_REQUEST);
@@ -243,7 +243,7 @@ void NpcHandler::buyItem(int beingId _UNUSED_, int itemId,
}
}
-void NpcHandler::sellItem(int beingId _UNUSED_, int itemId, int amount)
+void NpcHandler::sellItem(int beingId A_UNUSED, int itemId, int amount)
{
MessageOut outMsg(CMSG_NPC_SELL_REQUEST);
outMsg.writeInt16(8); // One item (length of packet)
@@ -251,7 +251,7 @@ void NpcHandler::sellItem(int beingId _UNUSED_, int itemId, int amount)
outMsg.writeInt16(static_cast<Sint16>(amount));
}
-void NpcHandler::endShopping(int beingId _UNUSED_)
+void NpcHandler::endShopping(int beingId A_UNUSED)
{
// TODO
}
diff --git a/src/net/tmwa/npchandler.h b/src/net/tmwa/npchandler.h
index 83d8e7981..1b4455854 100644
--- a/src/net/tmwa/npchandler.h
+++ b/src/net/tmwa/npchandler.h
@@ -31,9 +31,9 @@
#include <map>
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
class NpcDialog;
diff --git a/src/net/tmwa/partyhandler.cpp b/src/net/tmwa/partyhandler.cpp
index eb99c2299..f057b6f5f 100644
--- a/src/net/tmwa/partyhandler.cpp
+++ b/src/net/tmwa/partyhandler.cpp
@@ -463,7 +463,7 @@ void PartyHandler::create(const std::string &name)
outMsg.writeString(name.substr(0, 23), 24);
}
-void PartyHandler::join(int partyId _UNUSED_)
+void PartyHandler::join(int partyId A_UNUSED)
{
// TODO?
}
@@ -490,7 +490,7 @@ void PartyHandler::invite(const std::string &name)
}
}
-void PartyHandler::inviteResponse(const std::string &inviter _UNUSED_,
+void PartyHandler::inviteResponse(const std::string &inviter A_UNUSED,
bool accept)
{
if (player_node)
diff --git a/src/net/tmwa/partyhandler.h b/src/net/tmwa/partyhandler.h
index 572824ed1..b2e08d12d 100644
--- a/src/net/tmwa/partyhandler.h
+++ b/src/net/tmwa/partyhandler.h
@@ -29,9 +29,9 @@
#include "party.h"
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
namespace TmwAthena
diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp
index e0f3e5c29..62027cdd4 100644
--- a/src/net/tmwa/playerhandler.cpp
+++ b/src/net/tmwa/playerhandler.cpp
@@ -64,7 +64,7 @@ namespace
*/
struct WeightListener : public gcn::ActionListener
{
- void action(const gcn::ActionEvent &event _UNUSED_)
+ void action(const gcn::ActionEvent &event A_UNUSED)
{
weightNotice = NULL;
}
@@ -75,7 +75,7 @@ namespace
*/
struct DeathListener : public gcn::ActionListener
{
- void action(const gcn::ActionEvent &event _UNUSED_)
+ void action(const gcn::ActionEvent &event A_UNUSED)
{
Net::getPlayerHandler()->respawn();
deathNotice = NULL;
@@ -675,7 +675,7 @@ void PlayerHandler::increaseAttribute(int attr)
}
}
-void PlayerHandler::decreaseAttribute(int attr _UNUSED_)
+void PlayerHandler::decreaseAttribute(int attr A_UNUSED)
{
// Supported by eA?
}
@@ -748,13 +748,13 @@ void PlayerHandler::respawn()
outMsg.writeInt8(0);
}
-void PlayerHandler::ignorePlayer(const std::string &player _UNUSED_,
- bool ignore _UNUSED_)
+void PlayerHandler::ignorePlayer(const std::string &player A_UNUSED,
+ bool ignore A_UNUSED)
{
// TODO
}
-void PlayerHandler::ignoreAll(bool ignore _UNUSED_)
+void PlayerHandler::ignoreAll(bool ignore A_UNUSED)
{
// TODO
}
diff --git a/src/net/tmwa/playerhandler.h b/src/net/tmwa/playerhandler.h
index f77bd11b8..d4e232ecf 100644
--- a/src/net/tmwa/playerhandler.h
+++ b/src/net/tmwa/playerhandler.h
@@ -29,9 +29,9 @@
#include "net/tmwa/messagehandler.h"
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
namespace TmwAthena
diff --git a/src/net/tmwa/specialhandler.cpp b/src/net/tmwa/specialhandler.cpp
index 1e6249a51..a2a2f3fb2 100644
--- a/src/net/tmwa/specialhandler.cpp
+++ b/src/net/tmwa/specialhandler.cpp
@@ -257,7 +257,7 @@ void SpecialHandler::handleMessage(Net::MessageIn &msg)
}
}
-void SpecialHandler::use(int id _UNUSED_)
+void SpecialHandler::use(int id A_UNUSED)
{
// TODO
}
diff --git a/src/net/tmwa/specialhandler.h b/src/net/tmwa/specialhandler.h
index 9bee8b83b..6f1e53aa0 100644
--- a/src/net/tmwa/specialhandler.h
+++ b/src/net/tmwa/specialhandler.h
@@ -29,9 +29,9 @@
#include "net/tmwa/messagehandler.h"
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
namespace TmwAthena
diff --git a/src/net/tmwa/tradehandler.cpp b/src/net/tmwa/tradehandler.cpp
index f7d6787d0..e1bff1634 100644
--- a/src/net/tmwa/tradehandler.cpp
+++ b/src/net/tmwa/tradehandler.cpp
@@ -332,7 +332,7 @@ void TradeHandler::addItem(Item *item, int amount)
outMsg.writeInt32(amount);
}
-void TradeHandler::removeItem(int slotNum _UNUSED_, int amount _UNUSED_)
+void TradeHandler::removeItem(int slotNum A_UNUSED, int amount A_UNUSED)
{
// TODO
}
diff --git a/src/net/tmwa/tradehandler.h b/src/net/tmwa/tradehandler.h
index 064f1f618..89f8d8a3a 100644
--- a/src/net/tmwa/tradehandler.h
+++ b/src/net/tmwa/tradehandler.h
@@ -29,9 +29,9 @@
#include "net/tmwa/messagehandler.h"
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
namespace TmwAthena
diff --git a/src/net/tradehandler.h b/src/net/tradehandler.h
index eab9d2aaf..837c53eeb 100644
--- a/src/net/tradehandler.h
+++ b/src/net/tradehandler.h
@@ -28,9 +28,9 @@
#include <iosfwd>
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
namespace Net
@@ -38,20 +38,20 @@ namespace Net
class TradeHandler
{
public:
- virtual void request(Being *being _UNUSED_)
+ virtual void request(Being *being A_UNUSED)
{ }
// virtual ~TradeHandler() {}
- virtual void respond(bool accept _UNUSED_)
+ virtual void respond(bool accept A_UNUSED)
{ }
- virtual void addItem(Item *item _UNUSED_, int amount _UNUSED_)
+ virtual void addItem(Item *item A_UNUSED, int amount A_UNUSED)
{ }
- virtual void removeItem(int slotNum _UNUSED_, int amount _UNUSED_)
+ virtual void removeItem(int slotNum A_UNUSED, int amount A_UNUSED)
{ }
- virtual void setMoney(int amount _UNUSED_)
+ virtual void setMoney(int amount A_UNUSED)
{ }
virtual void confirm()
diff --git a/src/opengl1graphics.cpp b/src/opengl1graphics.cpp
index 78396c8c8..0bba38522 100644
--- a/src/opengl1graphics.cpp
+++ b/src/opengl1graphics.cpp
@@ -398,14 +398,14 @@ void OpenGL1Graphics::drawRescaledImagePattern(Image *image, int x, int y,
bool OpenGL1Graphics::calcImageRect(GraphicsVertexes* vert,
int x, int y, int w, int h,
- Image *topLeft _UNUSED_,
- Image *topRight _UNUSED_,
- Image *bottomLeft _UNUSED_,
- Image *bottomRight _UNUSED_,
- Image *top _UNUSED_, Image *right _UNUSED_,
- Image *bottom _UNUSED_,
- Image *left _UNUSED_,
- Image *center _UNUSED_)
+ Image *topLeft A_UNUSED,
+ Image *topRight A_UNUSED,
+ Image *bottomLeft A_UNUSED,
+ Image *bottomRight A_UNUSED,
+ Image *top A_UNUSED, Image *right A_UNUSED,
+ Image *bottom A_UNUSED,
+ Image *left A_UNUSED,
+ Image *center A_UNUSED)
{
if (!vert)
return false;
@@ -584,7 +584,7 @@ void OpenGL1Graphics::fillRectangle(const gcn::Rectangle& rect)
drawRectangle(rect, true);
}
-void OpenGL1Graphics::setTargetPlane(int width _UNUSED_, int height _UNUSED_)
+void OpenGL1Graphics::setTargetPlane(int width A_UNUSED, int height A_UNUSED)
{
}
diff --git a/src/opengl1graphics.h b/src/opengl1graphics.h
index 0c29ec1ca..05ec9f79b 100644
--- a/src/opengl1graphics.h
+++ b/src/opengl1graphics.h
@@ -34,9 +34,9 @@
#endif
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
class OpenGL1Graphics : public Graphics
diff --git a/src/openglgraphics.cpp b/src/openglgraphics.cpp
index b2e4d8931..e27de66c5 100644
--- a/src/openglgraphics.cpp
+++ b/src/openglgraphics.cpp
@@ -989,7 +989,7 @@ void OpenGLGraphics::fillRectangle(const gcn::Rectangle& rect)
drawRectangle(rect, true);
}
-void OpenGLGraphics::setTargetPlane(int width _UNUSED_, int height _UNUSED_)
+void OpenGLGraphics::setTargetPlane(int width A_UNUSED, int height A_UNUSED)
{
}
diff --git a/src/openglgraphics.h b/src/openglgraphics.h
index c06f36228..3fa08f290 100644
--- a/src/openglgraphics.h
+++ b/src/openglgraphics.h
@@ -34,9 +34,9 @@
#endif
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
class OpenGLGraphics : public Graphics
diff --git a/src/particle.h b/src/particle.h
index 64811599e..e90a1f37f 100644
--- a/src/particle.h
+++ b/src/particle.h
@@ -31,9 +31,9 @@
#include <string>
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
class Map;
@@ -272,7 +272,7 @@ class Particle : public Actor
virtual float getAlpha() const
{ return 1.0f; }
- virtual void setAlpha(float alpha _UNUSED_) {}
+ virtual void setAlpha(float alpha A_UNUSED) {}
virtual void setDeathEffect(const std::string &effectFile,
char conditions)
diff --git a/src/playerrelations.cpp b/src/playerrelations.cpp
index 4ac70b81f..5b25ae5fb 100644
--- a/src/playerrelations.cpp
+++ b/src/playerrelations.cpp
@@ -401,7 +401,7 @@ public:
mShortName = PLAYER_IGNORE_STRATEGY_NOP;
}
- virtual void ignore(Being *being _UNUSED_, unsigned int flags _UNUSED_)
+ virtual void ignore(Being *being A_UNUSED, unsigned int flags A_UNUSED)
{
}
};
@@ -415,7 +415,7 @@ public:
mShortName = "dotdotdot";
}
- virtual void ignore(Being *being, unsigned int flags _UNUSED_)
+ virtual void ignore(Being *being, unsigned int flags A_UNUSED)
{
if (!being)
return;
@@ -435,7 +435,7 @@ public:
mShortName = "blinkname";
}
- virtual void ignore(Being *being, unsigned int flags _UNUSED_)
+ virtual void ignore(Being *being, unsigned int flags A_UNUSED)
{
if (!being)
return;
@@ -456,7 +456,7 @@ public:
mShortName = shortname;
}
- virtual void ignore(Being *being, unsigned int flags _UNUSED_)
+ virtual void ignore(Being *being, unsigned int flags A_UNUSED)
{
if (!being)
return;
diff --git a/src/playerrelations.h b/src/playerrelations.h
index 613a27d01..bb483a793 100644
--- a/src/playerrelations.h
+++ b/src/playerrelations.h
@@ -29,9 +29,9 @@
#include <vector>
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
class Being;
diff --git a/src/resources/itemdb.h b/src/resources/itemdb.h
index ee16a6355..dedaa9ad1 100644
--- a/src/resources/itemdb.h
+++ b/src/resources/itemdb.h
@@ -29,9 +29,9 @@
#include <string>
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
class ItemInfo;
diff --git a/src/resources/mapreader.h b/src/resources/mapreader.h
index 927b76173..b10f35d89 100644
--- a/src/resources/mapreader.h
+++ b/src/resources/mapreader.h
@@ -28,9 +28,9 @@
#include <string>
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
class Map;
diff --git a/src/shopitem.h b/src/shopitem.h
index 5d78b918c..188698438 100644
--- a/src/shopitem.h
+++ b/src/shopitem.h
@@ -20,8 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _SHOPITEM_H
-#define _SHOPITEM_H
+#ifndef M_SHOPITEM_H
+#define M_SHOPITEM_H
#include "item.h"
diff --git a/src/textmanager.cpp b/src/textmanager.cpp
index a8b62bcf2..c9da12e92 100644
--- a/src/textmanager.cpp
+++ b/src/textmanager.cpp
@@ -72,7 +72,7 @@ void TextManager::draw(gcn::Graphics *graphics, int xOff, int yOff)
}
void TextManager::place(const Text *textObj, const Text *omit,
- int &x _UNUSED_, int &y, int h)
+ int &x A_UNUSED, int &y, int h)
{
int xLeft = textObj->mX;
int xRight1 = xLeft + textObj->mWidth;
diff --git a/src/textmanager.h b/src/textmanager.h
index ed4b80c5f..019214bb6 100644
--- a/src/textmanager.h
+++ b/src/textmanager.h
@@ -26,9 +26,9 @@
#include "guichanfwd.h"
#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((unused))
+#define A_UNUSED __attribute__ ((unused))
#else
-#define _UNUSED_
+#define A_UNUSED
#endif
class Text;
diff --git a/src/utils/mkdir.cpp b/src/utils/mkdir.cpp
index a031fe717..84c205b33 100644
--- a/src/utils/mkdir.cpp
+++ b/src/utils/mkdir.cpp
@@ -29,7 +29,7 @@
#include <sys/stat.h>
-#ifdef _MKDIR_TEST_
+#ifdef M_MKDIR_TEST_
// compile with -D_MKDIR_TEST_ to get a standalone binary
#include <cstdio>
#include <cstdlib>
@@ -94,7 +94,7 @@ int mkdir_r(const char *pathname)
return -1;
}
-#ifdef _MKDIR_TEST_
+#ifdef M_MKDIR_TEST_
printf("%s\n", tmp);
#endif
*p = '/';
@@ -153,7 +153,7 @@ int mkdir_r(const char *pathname)
return -1;
}
-#ifdef _MKDIR_TEST_
+#ifdef M_MKDIR_TEST_
printf("%s\n", tmp);
#endif
*p = '/';
@@ -164,7 +164,7 @@ int mkdir_r(const char *pathname)
}
#endif
-#ifdef _MKDIR_TEST_
+#ifdef M_MKDIR_TEST_
int main(int argc, char** argv)
{
if (argc < 2) exit(1);
diff --git a/src/utils/mkdir.h b/src/utils/mkdir.h
index b1fb9afb0..deff75475 100644
--- a/src/utils/mkdir.h
+++ b/src/utils/mkdir.h
@@ -19,8 +19,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _MKDIR_H
-#define _MKDIR_H
+#ifndef M_MKDIR_H
+#define M_MKDIR_H
int mkdir_r(const char *pathname);
diff --git a/src/utils/specialfolder.cpp b/src/utils/specialfolder.cpp
index 5ac06848f..31eaec687 100644
--- a/src/utils/specialfolder.cpp
+++ b/src/utils/specialfolder.cpp
@@ -23,7 +23,7 @@
#include "utils/specialfolder.h"
#include <windows.h>
-#ifdef _SPECIALFOLDERLOCATION_TEST_
+#ifdef M_SPECIALFOLDERLOCATION_TEST_
// compile with -D_SPECIALFOLDERLOCATION_TEST_ to get a standalone
// binary for testing
#include <iostream>
@@ -62,7 +62,7 @@ std::string getSpecialFolderLocation(int folderId)
return ret;
}
-#ifdef _SPECIALFOLDERLOCATION_TEST_
+#ifdef M_SPECIALFOLDERLOCATION_TEST_
int main()
{
std::cout << "APPDATA " << getSpecialFolderLocation(CSIDL_APPDATA)
diff --git a/src/utils/specialfolder.h b/src/utils/specialfolder.h
index 2ca6259c6..571817370 100644
--- a/src/utils/specialfolder.h
+++ b/src/utils/specialfolder.h
@@ -19,8 +19,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _SPECIALFOLDER_H
-#define _SPECIALFOLDER_H
+#ifndef M_SPECIALFOLDER_H
+#define M_SPECIALFOLDER_H
#ifdef WIN32
#include <shlobj.h>