From 80c6992f9ccb088679cab206056caaafec33c287 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 18 Nov 2011 04:32:55 +0300 Subject: Show changed yellow bar modes in debug chat tab. --- src/gui/statuswindow.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/gui/statuswindow.h') diff --git a/src/gui/statuswindow.h b/src/gui/statuswindow.h index fa957d059..0af8d4276 100644 --- a/src/gui/statuswindow.h +++ b/src/gui/statuswindow.h @@ -82,7 +82,9 @@ class StatusWindow : public Window, void action(const gcn::ActionEvent &event); private: - static std::string translateLetter(char* letters); + static std::string translateLetter(const char* letters); + + static std::string translateLetter2(std::string letters); /** * Status Part -- cgit v1.2.3-70-g09d2 From 34a492ac70b3217937eafeb6db3cb9bfdc18fba9 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 25 Nov 2011 01:11:42 +0300 Subject: Move A_UNUSED define to include file. --- src/actorspritemanager.h | 6 ----- src/being.h | 6 ----- src/client.h | 6 ----- src/commandhandler.h | 41 +++++++++++--------------------- src/graphics.h | 8 ------- src/gui/botcheckerwindow.h | 6 ----- src/gui/buydialog.h | 6 ----- src/gui/chatwindow.h | 6 ----- src/gui/didyouknowwindow.h | 9 +------ src/gui/equipmentwindow.h | 6 ----- src/gui/helpwindow.h | 6 +---- src/gui/inventorywindow.h | 7 ------ src/gui/itemamountwindow.h | 6 ----- src/gui/ministatuswindow.h | 6 ----- src/gui/popupmenu.h | 6 +---- src/gui/register.h | 6 ----- src/gui/selldialog.h | 6 ----- src/gui/setup_colors.h | 6 ----- src/gui/setup_relations.h | 6 ----- src/gui/shopwindow.h | 6 ----- src/gui/skilldialog.h | 6 ----- src/gui/socialwindow.h | 6 ----- src/gui/specialswindow.h | 6 ----- src/gui/statuswindow.h | 6 ----- src/gui/viewport.h | 6 ----- src/gui/widgets/chattab.h | 10 ++++---- src/gui/widgets/checkbox.h | 6 ----- src/gui/widgets/desktop.h | 6 ----- src/gui/widgets/dropshortcutcontainer.h | 6 ----- src/gui/widgets/emoteshortcutcontainer.h | 6 ----- src/gui/widgets/flowcontainer.h | 6 ----- src/gui/widgets/guitable.h | 6 ----- src/gui/widgets/horizontcontainer.h | 6 ----- src/gui/widgets/inventoryfilter.h | 6 ----- src/gui/widgets/itemcontainer.h | 6 ----- src/gui/widgets/itemlinkhandler.h | 11 +++------ src/gui/widgets/itemshortcutcontainer.h | 6 ----- src/gui/widgets/layouthelper.h | 6 ----- src/gui/widgets/listbox.h | 6 ----- src/gui/widgets/popup.h | 6 ----- src/gui/widgets/radiobutton.h | 6 ----- src/gui/widgets/scrollarea.h | 6 ----- src/gui/widgets/setupitem.h | 6 ----- src/gui/widgets/setuptabscroll.h | 6 +---- src/gui/widgets/shoplistbox.h | 8 +------ src/gui/widgets/shortcutcontainer.h | 9 ++----- src/gui/widgets/slider.h | 6 ----- src/gui/widgets/spellshortcutcontainer.h | 7 ------ src/gui/widgets/tabbedarea.h | 6 ----- src/gui/widgets/vertcontainer.h | 6 ----- src/gui/widgets/window.h | 6 ----- src/gui/windowmenu.h | 8 ++----- src/imagesprite.h | 6 ----- src/localconsts.h | 6 +++++ src/localplayer.h | 6 ----- src/main.h | 6 ----- src/map.h | 6 ----- src/net/download.h | 6 ----- src/net/ea/adminhandler.h | 6 ----- src/net/ea/beinghandler.h | 6 ----- src/net/ea/charserverhandler.h | 6 ----- src/net/ea/chathandler.h | 6 ----- src/net/ea/gamehandler.h | 6 ----- src/net/ea/guildhandler.h | 6 ----- src/net/ea/inventoryhandler.h | 6 ----- src/net/ea/loginhandler.h | 6 ----- src/net/ea/npchandler.h | 6 ----- src/net/ea/partyhandler.h | 6 ----- src/net/ea/playerhandler.h | 6 ----- src/net/ea/specialhandler.h | 6 ----- src/net/ea/tradehandler.h | 6 ----- src/net/manaserv/adminhandler.h | 6 ----- src/net/manaserv/beinghandler.h | 6 ----- src/net/manaserv/buysellhandler.h | 6 ----- src/net/manaserv/chathandler.h | 6 ----- src/net/manaserv/gamehandler.h | 6 ----- src/net/manaserv/generalhandler.h | 6 ----- src/net/manaserv/guildhandler.h | 8 +------ src/net/manaserv/inventoryhandler.h | 6 ----- src/net/manaserv/loginhandler.h | 6 ----- src/net/manaserv/npchandler.h | 6 ----- src/net/manaserv/partyhandler.h | 7 +----- src/net/manaserv/playerhandler.h | 6 ----- src/net/manaserv/specialhandler.h | 6 ----- src/net/manaserv/tradehandler.h | 6 ----- src/net/messageout.h | 6 ----- src/net/tmwa/adminhandler.h | 6 ----- src/net/tmwa/charserverhandler.h | 6 ----- src/net/tmwa/chathandler.h | 6 ----- src/net/tmwa/gamehandler.h | 6 ----- src/net/tmwa/generalhandler.h | 6 ----- src/net/tmwa/guildhandler.h | 8 +------ src/net/tmwa/inventoryhandler.h | 6 ----- src/net/tmwa/loginhandler.h | 6 ----- src/net/tmwa/npchandler.h | 6 ----- src/net/tmwa/partyhandler.h | 6 ----- src/net/tmwa/playerhandler.h | 6 ----- src/net/tmwa/specialhandler.h | 6 ----- src/net/tmwa/tradehandler.h | 6 ----- src/net/tradehandler.h | 7 +----- src/opengl1graphics.h | 6 ----- src/openglgraphics.h | 6 ----- src/particle.h | 10 +++----- src/playerrelations.h | 6 ----- src/resources/itemdb.h | 6 ----- src/resources/mapreader.h | 6 ----- src/textmanager.h | 6 ----- 107 files changed, 43 insertions(+), 667 deletions(-) (limited to 'src/gui/statuswindow.h') diff --git a/src/actorspritemanager.h b/src/actorspritemanager.h index d2d9af108..f1f83634d 100644 --- a/src/actorspritemanager.h +++ b/src/actorspritemanager.h @@ -30,12 +30,6 @@ #include -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - class LocalPlayer; class Map; diff --git a/src/being.h b/src/being.h index 1a5644929..f1cae8df7 100644 --- a/src/being.h +++ b/src/being.h @@ -23,12 +23,6 @@ #ifndef BEING_H #define BEING_H -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - #include "actorsprite.h" #include "configlistener.h" #include "equipment.h" diff --git a/src/client.h b/src/client.h index 776e9aa3d..b3fc0d676 100644 --- a/src/client.h +++ b/src/client.h @@ -36,12 +36,6 @@ #include -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - class Button; class Desktop; class LoginData; diff --git a/src/commandhandler.h b/src/commandhandler.h index 809e9e517..f8b44e04f 100644 --- a/src/commandhandler.h +++ b/src/commandhandler.h @@ -31,12 +31,6 @@ class ChatTab; extern ChatTab *localChatTab; -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - #define BOOLEAN_OPTIONS _("Options to /%s are \"yes\", \"no\", \"true\", "\ "\"false\", \"1\", \"0\".") @@ -263,23 +257,21 @@ class CommandHandler */ void handleNavigate(const std::string &args, ChatTab *tab); - void handleMail(const std::string &args, ChatTab *tab A_UNUSED); + void handleMail(const std::string &args, ChatTab *tab); void handleHack(const std::string &args, ChatTab *tab); - void handlePriceLoad(const std::string &args A_UNUSED, - ChatTab *tab A_UNUSED); + void handlePriceLoad(const std::string &args, ChatTab *tab); - void handlePriceSave(const std::string &args A_UNUSED, - ChatTab *tab A_UNUSED); + void handlePriceSave(const std::string &args, ChatTab *tab); - void handleTrade(const std::string &args, ChatTab *tab A_UNUSED); + void handleTrade(const std::string &args, ChatTab *tab); - void handleDisconnect(const std::string &args, ChatTab *tab A_UNUSED); + void handleDisconnect(const std::string &args, ChatTab *tab); - void handleUndress(const std::string &args, ChatTab *tab A_UNUSED); + void handleUndress(const std::string &args, ChatTab *tab); - void handleAttack(const std::string &args, ChatTab *tab A_UNUSED); + void handleAttack(const std::string &args, ChatTab *tab); void handleDirs(const std::string &args, ChatTab *tab); @@ -289,22 +281,17 @@ class CommandHandler void handleUptime(const std::string &args, ChatTab *tab); - void handleAddAttack(const std::string &args, ChatTab *tab A_UNUSED); + void handleAddAttack(const std::string &args, ChatTab *tab); - void handleAddPriorityAttack(const std::string &args, - ChatTab *tab A_UNUSED); + void handleAddPriorityAttack(const std::string &args, ChatTab *tab); - void handleRemoveAttack(const std::string &args, - ChatTab *tab A_UNUSED); + void handleRemoveAttack(const std::string &args, ChatTab *tab); - void handleAddIgnoreAttack(const std::string &args, - ChatTab *tab A_UNUSED); + void handleAddIgnoreAttack(const std::string &args, ChatTab *tab); - void handleServerIgnoreAll(const std::string &args, - ChatTab *tab A_UNUSED); + void handleServerIgnoreAll(const std::string &args, ChatTab *tab); - void handleServerUnIgnoreAll(const std::string &args, - ChatTab *tab A_UNUSED); + void handleServerUnIgnoreAll(const std::string &args, ChatTab *tab); void handleDump(const std::string &args, ChatTab *tab); @@ -313,7 +300,7 @@ class CommandHandler void outString(ChatTab *tab, const std::string &str, const std::string &def); - void handleCacheInfo(const std::string &args, ChatTab *tab A_UNUSED); + void handleCacheInfo(const std::string &args, ChatTab *tab); bool parse2Int(const std::string &args, int *x, int *y); }; diff --git a/src/graphics.h b/src/graphics.h index 4a4676b26..2502c0418 100644 --- a/src/graphics.h +++ b/src/graphics.h @@ -25,14 +25,6 @@ #include -//include "graphicsvertexes.h" - -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - class GraphicsVertexes; class Image; class ImageVertexes; diff --git a/src/gui/botcheckerwindow.h b/src/gui/botcheckerwindow.h index 6af9c91d6..86d5ef290 100644 --- a/src/gui/botcheckerwindow.h +++ b/src/gui/botcheckerwindow.h @@ -32,12 +32,6 @@ #include -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - struct BOTCHK { short id; /**< Index into "botchecker_db" array */ diff --git a/src/gui/buydialog.h b/src/gui/buydialog.h index 53d20e1e5..6bc10a103 100644 --- a/src/gui/buydialog.h +++ b/src/gui/buydialog.h @@ -30,12 +30,6 @@ #include #include -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - class ShopItems; class ShopListBox; class IntTextField; diff --git a/src/gui/chatwindow.h b/src/gui/chatwindow.h index 1ad468a3b..ad5229ffe 100644 --- a/src/gui/chatwindow.h +++ b/src/gui/chatwindow.h @@ -38,12 +38,6 @@ #include #include -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - class BrowserBox; class ChatTab; class Channel; diff --git a/src/gui/didyouknowwindow.h b/src/gui/didyouknowwindow.h index b135103e8..d9734e8fe 100644 --- a/src/gui/didyouknowwindow.h +++ b/src/gui/didyouknowwindow.h @@ -28,12 +28,6 @@ #include -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - class Button; class BrowserBox; class CheckBox; @@ -59,8 +53,7 @@ class DidYouKnowWindow : public Window, public LinkHandler, /** * Handles link action. */ - void handleLink(const std::string &link, - gcn::MouseEvent *event A_UNUSED); + void handleLink(const std::string &link, gcn::MouseEvent *event); void loadData(int num = 0); diff --git a/src/gui/equipmentwindow.h b/src/gui/equipmentwindow.h index b7d71d49f..0a3c2da20 100644 --- a/src/gui/equipmentwindow.h +++ b/src/gui/equipmentwindow.h @@ -37,12 +37,6 @@ #include -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - class Being; class Inventory; class Image; diff --git a/src/gui/helpwindow.h b/src/gui/helpwindow.h index d59289db0..178ae1e16 100644 --- a/src/gui/helpwindow.h +++ b/src/gui/helpwindow.h @@ -28,11 +28,7 @@ #include -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif +#include "localconsts.h" class BrowserBox; class LinkHandler; diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h index 9dadeb5a8..aa78705b8 100644 --- a/src/gui/inventorywindow.h +++ b/src/gui/inventorywindow.h @@ -35,12 +35,6 @@ #include #include -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - class DropDown; class Item; class ItemContainer; @@ -48,7 +42,6 @@ class InventoryFilter; class LayoutCell; class ProgressBar; class SortListModel; -//class TextBox; class TextField; /** diff --git a/src/gui/itemamountwindow.h b/src/gui/itemamountwindow.h index 2dffdc286..bacd4cfd0 100644 --- a/src/gui/itemamountwindow.h +++ b/src/gui/itemamountwindow.h @@ -28,12 +28,6 @@ #include #include -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - class Icon; class IntTextField; class Item; diff --git a/src/gui/ministatuswindow.h b/src/gui/ministatuswindow.h index 5e1b442dc..6fb8f7652 100644 --- a/src/gui/ministatuswindow.h +++ b/src/gui/ministatuswindow.h @@ -31,12 +31,6 @@ #include -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - class AnimatedSprite; class Graphics; class ProgressBar; diff --git a/src/gui/popupmenu.h b/src/gui/popupmenu.h index 3a7f27d4b..4bbe2c46c 100644 --- a/src/gui/popupmenu.h +++ b/src/gui/popupmenu.h @@ -28,11 +28,7 @@ #include -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif +#include "localconsts.h" class Being; class BrowserBox; diff --git a/src/gui/register.h b/src/gui/register.h index 34bcadd6d..b0137f141 100644 --- a/src/gui/register.h +++ b/src/gui/register.h @@ -30,12 +30,6 @@ #include -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - class LoginData; class OkDialog; diff --git a/src/gui/selldialog.h b/src/gui/selldialog.h index 46cb077e1..a775cf0e0 100644 --- a/src/gui/selldialog.h +++ b/src/gui/selldialog.h @@ -30,12 +30,6 @@ #include -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - class Item; class ShopItems; class ShopListBox; diff --git a/src/gui/setup_colors.h b/src/gui/setup_colors.h index 850f23897..b6d5209e2 100644 --- a/src/gui/setup_colors.h +++ b/src/gui/setup_colors.h @@ -31,12 +31,6 @@ #include -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - class BrowserBox; class TextField; class TextPreview; diff --git a/src/gui/setup_relations.h b/src/gui/setup_relations.h index a6627a06d..2c23d4dba 100644 --- a/src/gui/setup_relations.h +++ b/src/gui/setup_relations.h @@ -30,12 +30,6 @@ #include -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - class EditDialog; class GuiTable; class PlayerTableModel; diff --git a/src/gui/shopwindow.h b/src/gui/shopwindow.h index 8b170f31e..e1fd8a2a0 100644 --- a/src/gui/shopwindow.h +++ b/src/gui/shopwindow.h @@ -30,12 +30,6 @@ #include #include -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - class CheckBox; class Item; class ListBox; diff --git a/src/gui/skilldialog.h b/src/gui/skilldialog.h index 21ee56f5e..63f7d1790 100644 --- a/src/gui/skilldialog.h +++ b/src/gui/skilldialog.h @@ -42,12 +42,6 @@ class TabbedArea; struct SkillInfo; -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - /** * The skill dialog. * diff --git a/src/gui/socialwindow.h b/src/gui/socialwindow.h index 7dc962316..dec8a6c26 100644 --- a/src/gui/socialwindow.h +++ b/src/gui/socialwindow.h @@ -30,12 +30,6 @@ #include #include -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - class AttackTab; class Button; class ConfirmDialog; diff --git a/src/gui/specialswindow.h b/src/gui/specialswindow.h index 030c1343b..4350a656b 100644 --- a/src/gui/specialswindow.h +++ b/src/gui/specialswindow.h @@ -34,12 +34,6 @@ #include -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - class Label; class ScrollArea; class Tab; diff --git a/src/gui/statuswindow.h b/src/gui/statuswindow.h index 0af8d4276..d3a619bcb 100644 --- a/src/gui/statuswindow.h +++ b/src/gui/statuswindow.h @@ -37,12 +37,6 @@ class ProgressBar; class ScrollArea; class VertContainer; -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - /** * The player status dialog. * diff --git a/src/gui/viewport.h b/src/gui/viewport.h index 8823928a3..938988198 100644 --- a/src/gui/viewport.h +++ b/src/gui/viewport.h @@ -31,12 +31,6 @@ #include -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - class ActorSprite; class Button; class Being; diff --git a/src/gui/widgets/chattab.h b/src/gui/widgets/chattab.h index 4e077fafb..962c0b363 100644 --- a/src/gui/widgets/chattab.h +++ b/src/gui/widgets/chattab.h @@ -28,11 +28,7 @@ #include "gui/widgets/browserbox.h" #include "gui/widgets/tab.h" -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif +#include "localconsts.h" class ScrollArea; @@ -58,6 +54,7 @@ class ChatTab : public Tab * Constructor. */ ChatTab(const std::string &name); + ~ChatTab(); /** @@ -106,7 +103,8 @@ class ChatTab : public Tab * Add any extra help text to the output. Allows tabs to define help * for commands defined by the tab itself. */ - virtual void showHelp() {} + virtual void showHelp() + { } /** * Handle special commands. Allows a tab to handle commands it diff --git a/src/gui/widgets/checkbox.h b/src/gui/widgets/checkbox.h index 4e293aad6..af38065f5 100644 --- a/src/gui/widgets/checkbox.h +++ b/src/gui/widgets/checkbox.h @@ -27,12 +27,6 @@ #include "localconsts.h" -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - class Image; /** diff --git a/src/gui/widgets/desktop.h b/src/gui/widgets/desktop.h index 6364ecfe9..b1f059ffe 100644 --- a/src/gui/widgets/desktop.h +++ b/src/gui/widgets/desktop.h @@ -27,12 +27,6 @@ #include -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - class Image; /** diff --git a/src/gui/widgets/dropshortcutcontainer.h b/src/gui/widgets/dropshortcutcontainer.h index 348f48567..1f03fd53b 100644 --- a/src/gui/widgets/dropshortcutcontainer.h +++ b/src/gui/widgets/dropshortcutcontainer.h @@ -28,12 +28,6 @@ #include "gui/widgets/shortcutcontainer.h" -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - class Image; class Item; class ItemPopup; diff --git a/src/gui/widgets/emoteshortcutcontainer.h b/src/gui/widgets/emoteshortcutcontainer.h index 06c009f0b..743ca4e87 100644 --- a/src/gui/widgets/emoteshortcutcontainer.h +++ b/src/gui/widgets/emoteshortcutcontainer.h @@ -27,12 +27,6 @@ #include -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - class AnimatedSprite; class Image; class TextPopup; diff --git a/src/gui/widgets/flowcontainer.h b/src/gui/widgets/flowcontainer.h index 2ef6035f0..d1f276b3c 100644 --- a/src/gui/widgets/flowcontainer.h +++ b/src/gui/widgets/flowcontainer.h @@ -26,12 +26,6 @@ #include -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - /** * A container that arranges its contents like words on a page. * diff --git a/src/gui/widgets/guitable.h b/src/gui/widgets/guitable.h index cf3cb8ad8..17f517644 100644 --- a/src/gui/widgets/guitable.h +++ b/src/gui/widgets/guitable.h @@ -33,12 +33,6 @@ #include -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - class GuiTableActionListener; /** diff --git a/src/gui/widgets/horizontcontainer.h b/src/gui/widgets/horizontcontainer.h index 80014c171..2a3f77d2b 100644 --- a/src/gui/widgets/horizontcontainer.h +++ b/src/gui/widgets/horizontcontainer.h @@ -26,12 +26,6 @@ #include -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - /** * A widget container. * diff --git a/src/gui/widgets/inventoryfilter.h b/src/gui/widgets/inventoryfilter.h index be69489a8..c3762189e 100644 --- a/src/gui/widgets/inventoryfilter.h +++ b/src/gui/widgets/inventoryfilter.h @@ -27,12 +27,6 @@ #include "gui/widgets/horizontcontainer.h" -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - class InventoryFilter : public HorizontContainer, public gcn::ActionListener { public: diff --git a/src/gui/widgets/itemcontainer.h b/src/gui/widgets/itemcontainer.h index e4188f54b..2c465fdee 100644 --- a/src/gui/widgets/itemcontainer.h +++ b/src/gui/widgets/itemcontainer.h @@ -31,12 +31,6 @@ #include #include -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - class Image; class Inventory; class Item; diff --git a/src/gui/widgets/itemlinkhandler.h b/src/gui/widgets/itemlinkhandler.h index 8dd2f62f5..bc3bdc51c 100644 --- a/src/gui/widgets/itemlinkhandler.h +++ b/src/gui/widgets/itemlinkhandler.h @@ -25,21 +25,16 @@ #include "gui/widgets/linkhandler.h" -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - class ItemPopup; class ItemLinkHandler : public LinkHandler { public: ItemLinkHandler(); + ~ItemLinkHandler(); - void handleLink(const std::string &link, - gcn::MouseEvent *event A_UNUSED); + + void handleLink(const std::string &link, gcn::MouseEvent *event); private: ItemPopup *mItemPopup; diff --git a/src/gui/widgets/itemshortcutcontainer.h b/src/gui/widgets/itemshortcutcontainer.h index 473cef350..587723279 100644 --- a/src/gui/widgets/itemshortcutcontainer.h +++ b/src/gui/widgets/itemshortcutcontainer.h @@ -29,12 +29,6 @@ #include -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - class Image; class Item; class ItemPopup; diff --git a/src/gui/widgets/layouthelper.h b/src/gui/widgets/layouthelper.h index c38356c07..a01051595 100644 --- a/src/gui/widgets/layouthelper.h +++ b/src/gui/widgets/layouthelper.h @@ -27,12 +27,6 @@ #include -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - /** * A helper class for adding a layout to a Guichan container widget. The layout * will register itself as a widget listener and relayout the widgets in the diff --git a/src/gui/widgets/listbox.h b/src/gui/widgets/listbox.h index 418b83f58..8ac0bbc3b 100644 --- a/src/gui/widgets/listbox.h +++ b/src/gui/widgets/listbox.h @@ -25,12 +25,6 @@ #include -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - class SelectionListener; /** diff --git a/src/gui/widgets/popup.h b/src/gui/widgets/popup.h index 9d4343ba3..64e4b52ac 100644 --- a/src/gui/widgets/popup.h +++ b/src/gui/widgets/popup.h @@ -32,12 +32,6 @@ #include #include -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - class GraphicsVertexes; class Skin; class WindowContainer; diff --git a/src/gui/widgets/radiobutton.h b/src/gui/widgets/radiobutton.h index 677195bd6..d1c347acb 100644 --- a/src/gui/widgets/radiobutton.h +++ b/src/gui/widgets/radiobutton.h @@ -25,12 +25,6 @@ #include -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - class Image; /** diff --git a/src/gui/widgets/scrollarea.h b/src/gui/widgets/scrollarea.h index 56e21c58c..105791080 100644 --- a/src/gui/widgets/scrollarea.h +++ b/src/gui/widgets/scrollarea.h @@ -26,12 +26,6 @@ #include #include -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - class GraphicsVertexes; class Image; class ImageRect; diff --git a/src/gui/widgets/setupitem.h b/src/gui/widgets/setupitem.h index 15d2d41ea..5b8a9df87 100644 --- a/src/gui/widgets/setupitem.h +++ b/src/gui/widgets/setupitem.h @@ -33,12 +33,6 @@ #include -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - class CheckBox; class Configuration; class ContainerPlacer; diff --git a/src/gui/widgets/setuptabscroll.h b/src/gui/widgets/setuptabscroll.h index d2aa7002f..2b0c6f65e 100644 --- a/src/gui/widgets/setuptabscroll.h +++ b/src/gui/widgets/setuptabscroll.h @@ -26,11 +26,7 @@ #include #include -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif +#include "localconsts.h" class SetupItem; class ScrollArea; diff --git a/src/gui/widgets/shoplistbox.h b/src/gui/widgets/shoplistbox.h index 38e238f20..c5acbbefc 100644 --- a/src/gui/widgets/shoplistbox.h +++ b/src/gui/widgets/shoplistbox.h @@ -25,12 +25,6 @@ #include "gui/widgets/listbox.h" -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - class ShopItems; class ItemPopup; @@ -82,7 +76,7 @@ class ShopListBox : public ListBox void mouseMoved(gcn::MouseEvent &event); - void mouseExited(gcn::MouseEvent& mouseEvent A_UNUSED); + void mouseExited(gcn::MouseEvent& mouseEvent); private: void init(); diff --git a/src/gui/widgets/shortcutcontainer.h b/src/gui/widgets/shortcutcontainer.h index df8529bd5..8587950c6 100644 --- a/src/gui/widgets/shortcutcontainer.h +++ b/src/gui/widgets/shortcutcontainer.h @@ -29,12 +29,6 @@ #include "gui/widgets/tab.h" -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - class Image; /** @@ -55,7 +49,8 @@ class ShortcutContainer : public gcn::Widget, /** * Destructor. */ - ~ShortcutContainer() {} + ~ShortcutContainer() + { } /** * Draws the shortcuts diff --git a/src/gui/widgets/slider.h b/src/gui/widgets/slider.h index 619c0c795..9ac45d0a0 100644 --- a/src/gui/widgets/slider.h +++ b/src/gui/widgets/slider.h @@ -25,12 +25,6 @@ #include -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - class Image; /** diff --git a/src/gui/widgets/spellshortcutcontainer.h b/src/gui/widgets/spellshortcutcontainer.h index 88b00338a..4191f9921 100644 --- a/src/gui/widgets/spellshortcutcontainer.h +++ b/src/gui/widgets/spellshortcutcontainer.h @@ -27,13 +27,6 @@ #include #include "gui/widgets/shortcutcontainer.h" -//#include "textcommand.h" - -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif class Image; class SpellPopup; diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h index af241d7c5..d71109dd3 100644 --- a/src/gui/widgets/tabbedarea.h +++ b/src/gui/widgets/tabbedarea.h @@ -32,12 +32,6 @@ #include -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - class Tab; /** diff --git a/src/gui/widgets/vertcontainer.h b/src/gui/widgets/vertcontainer.h index 3b0ceeca7..08546aa47 100644 --- a/src/gui/widgets/vertcontainer.h +++ b/src/gui/widgets/vertcontainer.h @@ -28,12 +28,6 @@ #include -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - /** * A widget container. * diff --git a/src/gui/widgets/window.h b/src/gui/widgets/window.h index 5ace2328e..6249626d3 100644 --- a/src/gui/widgets/window.h +++ b/src/gui/widgets/window.h @@ -31,12 +31,6 @@ #include -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - class ContainerPlacer; class GraphicsVertexes; class Layout; diff --git a/src/gui/windowmenu.h b/src/gui/windowmenu.h index 739a302ba..3f02ea851 100644 --- a/src/gui/windowmenu.h +++ b/src/gui/windowmenu.h @@ -29,15 +29,11 @@ #include #include +#include "localconsts.h" + #include #include -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - class EmotePopup; class TextPopup; diff --git a/src/imagesprite.h b/src/imagesprite.h index c59dd8eec..9dad0f743 100644 --- a/src/imagesprite.h +++ b/src/imagesprite.h @@ -22,12 +22,6 @@ #ifndef IMAGESPRITE_H #define IMAGESPRITE_H -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - #include "sprite.h" #include "resources/image.h" diff --git a/src/localconsts.h b/src/localconsts.h index cd7fcd955..e135a4108 100644 --- a/src/localconsts.h +++ b/src/localconsts.h @@ -22,3 +22,9 @@ #undef nullptr #define nullptr 0 #endif + +#ifdef __GNUC__ +#define A_UNUSED __attribute__ ((unused)) +#else +#define A_UNUSED +#endif \ No newline at end of file diff --git a/src/localplayer.h b/src/localplayer.h index 56867a0b8..5b755e4f6 100644 --- a/src/localplayer.h +++ b/src/localplayer.h @@ -37,12 +37,6 @@ #include #include -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - class ChatTab; class FloorItem; class ImageSet; diff --git a/src/main.h b/src/main.h index f0f3b8c2c..36173a1c8 100644 --- a/src/main.h +++ b/src/main.h @@ -98,10 +98,4 @@ #define PKG_DATADIR "" #endif -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - #endif diff --git a/src/map.h b/src/map.h index 3fa607116..79dd01c41 100644 --- a/src/map.h +++ b/src/map.h @@ -32,12 +32,6 @@ #include #include -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - class Animation; class AmbientLayer; class Graphics; diff --git a/src/net/download.h b/src/net/download.h index 12c0c07d7..8339dee30 100644 --- a/src/net/download.h +++ b/src/net/download.h @@ -28,12 +28,6 @@ #include #include -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - enum DownloadStatus { DOWNLOAD_STATUS_CANCELLED = -3, diff --git a/src/net/ea/adminhandler.h b/src/net/ea/adminhandler.h index 2e311881f..5d1b7aa14 100644 --- a/src/net/ea/adminhandler.h +++ b/src/net/ea/adminhandler.h @@ -26,12 +26,6 @@ #include "net/adminhandler.h" #include "net/net.h" -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - namespace Ea { diff --git a/src/net/ea/beinghandler.h b/src/net/ea/beinghandler.h index f3769943d..f47385a61 100644 --- a/src/net/ea/beinghandler.h +++ b/src/net/ea/beinghandler.h @@ -26,12 +26,6 @@ #include "net/beinghandler.h" #include "net/net.h" -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - namespace Ea { diff --git a/src/net/ea/charserverhandler.h b/src/net/ea/charserverhandler.h index bab941503..bacde67b6 100644 --- a/src/net/ea/charserverhandler.h +++ b/src/net/ea/charserverhandler.h @@ -28,12 +28,6 @@ #include "net/net.h" #include "net/serverinfo.h" -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - class LoginData; namespace Ea diff --git a/src/net/ea/chathandler.h b/src/net/ea/chathandler.h index cff9bf589..d39e6788a 100644 --- a/src/net/ea/chathandler.h +++ b/src/net/ea/chathandler.h @@ -30,12 +30,6 @@ #include -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - namespace Ea { diff --git a/src/net/ea/gamehandler.h b/src/net/ea/gamehandler.h index 6d8b88bd4..511efe357 100644 --- a/src/net/ea/gamehandler.h +++ b/src/net/ea/gamehandler.h @@ -29,12 +29,6 @@ #include "net/messagein.h" #include "net/net.h" -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - namespace Ea { diff --git a/src/net/ea/guildhandler.h b/src/net/ea/guildhandler.h index 06edb2e89..5b090ec41 100644 --- a/src/net/ea/guildhandler.h +++ b/src/net/ea/guildhandler.h @@ -27,12 +27,6 @@ #include "net/ea/gui/guildtab.h" -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - namespace Ea { diff --git a/src/net/ea/inventoryhandler.h b/src/net/ea/inventoryhandler.h index d99e34fc6..6db6b18ed 100644 --- a/src/net/ea/inventoryhandler.h +++ b/src/net/ea/inventoryhandler.h @@ -38,12 +38,6 @@ #include #include -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - namespace Ea { diff --git a/src/net/ea/loginhandler.h b/src/net/ea/loginhandler.h index 06c47ad5d..62ace31c8 100644 --- a/src/net/ea/loginhandler.h +++ b/src/net/ea/loginhandler.h @@ -31,12 +31,6 @@ #include -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - class LoginData; namespace Ea diff --git a/src/net/ea/npchandler.h b/src/net/ea/npchandler.h index 44c1c5fb3..3e68c2321 100644 --- a/src/net/ea/npchandler.h +++ b/src/net/ea/npchandler.h @@ -29,12 +29,6 @@ #include -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - class NpcDialog; namespace Ea diff --git a/src/net/ea/partyhandler.h b/src/net/ea/partyhandler.h index 6ba0d0b82..596fda4f7 100644 --- a/src/net/ea/partyhandler.h +++ b/src/net/ea/partyhandler.h @@ -29,12 +29,6 @@ #include "party.h" -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - namespace Ea { diff --git a/src/net/ea/playerhandler.h b/src/net/ea/playerhandler.h index 57bcbdcd5..ceb4aba0b 100644 --- a/src/net/ea/playerhandler.h +++ b/src/net/ea/playerhandler.h @@ -27,12 +27,6 @@ #include "net/net.h" #include "net/playerhandler.h" -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - namespace Ea { diff --git a/src/net/ea/specialhandler.h b/src/net/ea/specialhandler.h index 06e8f8893..47b412f3e 100644 --- a/src/net/ea/specialhandler.h +++ b/src/net/ea/specialhandler.h @@ -27,12 +27,6 @@ #include "net/net.h" #include "net/specialhandler.h" -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - namespace Ea { diff --git a/src/net/ea/tradehandler.h b/src/net/ea/tradehandler.h index 2a27f8c31..6d623f60d 100644 --- a/src/net/ea/tradehandler.h +++ b/src/net/ea/tradehandler.h @@ -27,12 +27,6 @@ #include "net/net.h" #include "net/tradehandler.h" -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - namespace Ea { diff --git a/src/net/manaserv/adminhandler.h b/src/net/manaserv/adminhandler.h index 17d296bd6..5a71db35e 100644 --- a/src/net/manaserv/adminhandler.h +++ b/src/net/manaserv/adminhandler.h @@ -26,12 +26,6 @@ #include "net/adminhandler.h" #include "string" -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - namespace ManaServ { diff --git a/src/net/manaserv/beinghandler.h b/src/net/manaserv/beinghandler.h index 512d3e58f..59797f8f5 100644 --- a/src/net/manaserv/beinghandler.h +++ b/src/net/manaserv/beinghandler.h @@ -30,12 +30,6 @@ #include "vector.h" #include "map.h" -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - namespace ManaServ { diff --git a/src/net/manaserv/buysellhandler.h b/src/net/manaserv/buysellhandler.h index b38fdd9e7..e1a9c91e5 100644 --- a/src/net/manaserv/buysellhandler.h +++ b/src/net/manaserv/buysellhandler.h @@ -27,12 +27,6 @@ #include "net/buysellhandler.h" -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - namespace ManaServ { diff --git a/src/net/manaserv/chathandler.h b/src/net/manaserv/chathandler.h index 3ed7717ad..e93c2dd87 100644 --- a/src/net/manaserv/chathandler.h +++ b/src/net/manaserv/chathandler.h @@ -28,12 +28,6 @@ #include "net/manaserv/messagehandler.h" -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - namespace ManaServ { diff --git a/src/net/manaserv/gamehandler.h b/src/net/manaserv/gamehandler.h index a38052205..323b2566a 100644 --- a/src/net/manaserv/gamehandler.h +++ b/src/net/manaserv/gamehandler.h @@ -28,12 +28,6 @@ #include "net/manaserv/messagehandler.h" -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - namespace ManaServ { diff --git a/src/net/manaserv/generalhandler.h b/src/net/manaserv/generalhandler.h index ccdddbbe6..c6614707f 100644 --- a/src/net/manaserv/generalhandler.h +++ b/src/net/manaserv/generalhandler.h @@ -30,12 +30,6 @@ #include "net/manaserv/messagehandler.h" -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - namespace ManaServ { diff --git a/src/net/manaserv/guildhandler.h b/src/net/manaserv/guildhandler.h index 023e60b08..6a8db27c8 100644 --- a/src/net/manaserv/guildhandler.h +++ b/src/net/manaserv/guildhandler.h @@ -27,12 +27,6 @@ #include "net/manaserv/messagehandler.h" -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - namespace ManaServ { @@ -62,7 +56,7 @@ public: void memberList(int guildId); - void info(int guildId A_UNUSED); + void info(int guildId); void changeMemberPostion(GuildMember *member, int level); diff --git a/src/net/manaserv/inventoryhandler.h b/src/net/manaserv/inventoryhandler.h index fbe53d735..ba4535d79 100644 --- a/src/net/manaserv/inventoryhandler.h +++ b/src/net/manaserv/inventoryhandler.h @@ -29,12 +29,6 @@ #include "net/manaserv/messagehandler.h" -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - namespace ManaServ { diff --git a/src/net/manaserv/loginhandler.h b/src/net/manaserv/loginhandler.h index e60f00d92..0e8f2a4e6 100644 --- a/src/net/manaserv/loginhandler.h +++ b/src/net/manaserv/loginhandler.h @@ -28,12 +28,6 @@ #include "net/manaserv/messagehandler.h" -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - class LoginData; namespace ManaServ diff --git a/src/net/manaserv/npchandler.h b/src/net/manaserv/npchandler.h index f48e92ecb..f91858614 100644 --- a/src/net/manaserv/npchandler.h +++ b/src/net/manaserv/npchandler.h @@ -29,12 +29,6 @@ #include -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - class NpcDialog; namespace ManaServ diff --git a/src/net/manaserv/partyhandler.h b/src/net/manaserv/partyhandler.h index 89924c962..087936d72 100644 --- a/src/net/manaserv/partyhandler.h +++ b/src/net/manaserv/partyhandler.h @@ -27,16 +27,11 @@ #include "net/manaserv/messagehandler.h" +#include "localconsts.h" #include "party.h" #include -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - namespace ManaServ { diff --git a/src/net/manaserv/playerhandler.h b/src/net/manaserv/playerhandler.h index f00fea42a..21bbac516 100644 --- a/src/net/manaserv/playerhandler.h +++ b/src/net/manaserv/playerhandler.h @@ -29,12 +29,6 @@ #include -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - namespace ManaServ { diff --git a/src/net/manaserv/specialhandler.h b/src/net/manaserv/specialhandler.h index e7931f8ea..ccbe59fd9 100644 --- a/src/net/manaserv/specialhandler.h +++ b/src/net/manaserv/specialhandler.h @@ -27,12 +27,6 @@ #include "net/manaserv/messagehandler.h" -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - namespace ManaServ { diff --git a/src/net/manaserv/tradehandler.h b/src/net/manaserv/tradehandler.h index 35c260a8e..b5fcb3d3f 100644 --- a/src/net/manaserv/tradehandler.h +++ b/src/net/manaserv/tradehandler.h @@ -27,12 +27,6 @@ #include "net/manaserv/messagehandler.h" -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - namespace ManaServ { diff --git a/src/net/messageout.h b/src/net/messageout.h index 4445bbbe8..a169bfe2d 100644 --- a/src/net/messageout.h +++ b/src/net/messageout.h @@ -27,12 +27,6 @@ #include -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - namespace Net { diff --git a/src/net/tmwa/adminhandler.h b/src/net/tmwa/adminhandler.h index 53fd4831f..d81e2421a 100644 --- a/src/net/tmwa/adminhandler.h +++ b/src/net/tmwa/adminhandler.h @@ -30,12 +30,6 @@ #include "net/tmwa/messagehandler.h" -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - namespace TmwAthena { diff --git a/src/net/tmwa/charserverhandler.h b/src/net/tmwa/charserverhandler.h index 4bd3153e8..f1256e409 100644 --- a/src/net/tmwa/charserverhandler.h +++ b/src/net/tmwa/charserverhandler.h @@ -33,12 +33,6 @@ #include "net/ea/token.h" -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - class LoginData; namespace TmwAthena diff --git a/src/net/tmwa/chathandler.h b/src/net/tmwa/chathandler.h index 197ba12b3..9a88b7478 100644 --- a/src/net/tmwa/chathandler.h +++ b/src/net/tmwa/chathandler.h @@ -30,12 +30,6 @@ #include "net/tmwa/messagehandler.h" -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - namespace TmwAthena { diff --git a/src/net/tmwa/gamehandler.h b/src/net/tmwa/gamehandler.h index 6824ee672..ddb381058 100644 --- a/src/net/tmwa/gamehandler.h +++ b/src/net/tmwa/gamehandler.h @@ -31,12 +31,6 @@ #include "net/ea/gamehandler.h" -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - namespace TmwAthena { diff --git a/src/net/tmwa/generalhandler.h b/src/net/tmwa/generalhandler.h index 9ab8d64b4..e0f29fd1d 100644 --- a/src/net/tmwa/generalhandler.h +++ b/src/net/tmwa/generalhandler.h @@ -30,12 +30,6 @@ #include "net/tmwa/messagehandler.h" -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - namespace TmwAthena { diff --git a/src/net/tmwa/guildhandler.h b/src/net/tmwa/guildhandler.h index d8a1cc9e7..d8d291bdd 100644 --- a/src/net/tmwa/guildhandler.h +++ b/src/net/tmwa/guildhandler.h @@ -30,12 +30,6 @@ #include "net/tmwa/messagehandler.h" -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - namespace TmwAthena { @@ -64,7 +58,7 @@ class GuildHandler : public Ea::GuildHandler, public MessageHandler void memberList(int guildId); - void info(int guildId A_UNUSED); + void info(int guildId); void changeMemberPostion(GuildMember *member, int level); diff --git a/src/net/tmwa/inventoryhandler.h b/src/net/tmwa/inventoryhandler.h index 989ced27a..d924e8713 100644 --- a/src/net/tmwa/inventoryhandler.h +++ b/src/net/tmwa/inventoryhandler.h @@ -31,12 +31,6 @@ #include "net/tmwa/messagehandler.h" -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - namespace TmwAthena { diff --git a/src/net/tmwa/loginhandler.h b/src/net/tmwa/loginhandler.h index 1e73d3c99..c13c882a7 100644 --- a/src/net/tmwa/loginhandler.h +++ b/src/net/tmwa/loginhandler.h @@ -33,12 +33,6 @@ #include -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - class LoginData; namespace TmwAthena diff --git a/src/net/tmwa/npchandler.h b/src/net/tmwa/npchandler.h index 624f64cbc..548346205 100644 --- a/src/net/tmwa/npchandler.h +++ b/src/net/tmwa/npchandler.h @@ -32,12 +32,6 @@ #include -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - class NpcDialog; namespace TmwAthena diff --git a/src/net/tmwa/partyhandler.h b/src/net/tmwa/partyhandler.h index 209ea5047..4d727a986 100644 --- a/src/net/tmwa/partyhandler.h +++ b/src/net/tmwa/partyhandler.h @@ -30,12 +30,6 @@ #include "party.h" -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - namespace TmwAthena { diff --git a/src/net/tmwa/playerhandler.h b/src/net/tmwa/playerhandler.h index 4fd108e94..bf8e861ff 100644 --- a/src/net/tmwa/playerhandler.h +++ b/src/net/tmwa/playerhandler.h @@ -30,12 +30,6 @@ #include "net/tmwa/messagehandler.h" -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - namespace TmwAthena { diff --git a/src/net/tmwa/specialhandler.h b/src/net/tmwa/specialhandler.h index 21c1b9026..50bf31c0b 100644 --- a/src/net/tmwa/specialhandler.h +++ b/src/net/tmwa/specialhandler.h @@ -30,12 +30,6 @@ #include "net/tmwa/messagehandler.h" -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - namespace TmwAthena { diff --git a/src/net/tmwa/tradehandler.h b/src/net/tmwa/tradehandler.h index 85c153743..3a4c8c1fc 100644 --- a/src/net/tmwa/tradehandler.h +++ b/src/net/tmwa/tradehandler.h @@ -30,12 +30,6 @@ #include "net/tmwa/messagehandler.h" -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - namespace TmwAthena { diff --git a/src/net/tradehandler.h b/src/net/tradehandler.h index f099efe53..57219e675 100644 --- a/src/net/tradehandler.h +++ b/src/net/tradehandler.h @@ -27,11 +27,7 @@ #include -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif +#include "localconsts.h" namespace Net { @@ -43,7 +39,6 @@ class TradeHandler virtual void request(Being *being A_UNUSED) { } -// virtual ~TradeHandler() {} virtual void respond(bool accept A_UNUSED) { } diff --git a/src/opengl1graphics.h b/src/opengl1graphics.h index 3943a82fb..11df607f8 100644 --- a/src/opengl1graphics.h +++ b/src/opengl1graphics.h @@ -33,12 +33,6 @@ #include #endif -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - class OpenGL1Graphics : public Graphics { public: diff --git a/src/openglgraphics.h b/src/openglgraphics.h index 12eb2d9f8..d12810203 100644 --- a/src/openglgraphics.h +++ b/src/openglgraphics.h @@ -33,12 +33,6 @@ #include #endif -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - class OpenGLGraphics : public Graphics { public: diff --git a/src/particle.h b/src/particle.h index 2e3aa8740..ad448a054 100644 --- a/src/particle.h +++ b/src/particle.h @@ -25,17 +25,12 @@ #include "actor.h" #include "guichanfwd.h" +#include "localconsts.h" #include "vector.h" #include #include -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - class Map; class Particle; class ParticleEmitter; @@ -280,7 +275,8 @@ class Particle : public Actor virtual float getAlpha() const { return 1.0f; } - virtual void setAlpha(float alpha A_UNUSED) {} + virtual void setAlpha(float alpha A_UNUSED) + { } virtual void setDeathEffect(const std::string &effectFile, char conditions) diff --git a/src/playerrelations.h b/src/playerrelations.h index 5fabb3d0e..5eb1b3c64 100644 --- a/src/playerrelations.h +++ b/src/playerrelations.h @@ -28,12 +28,6 @@ #include #include -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - class Being; struct PlayerRelation diff --git a/src/resources/itemdb.h b/src/resources/itemdb.h index c20961eff..71f0a490e 100644 --- a/src/resources/itemdb.h +++ b/src/resources/itemdb.h @@ -28,12 +28,6 @@ #include #include -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - class ItemInfo; /** diff --git a/src/resources/mapreader.h b/src/resources/mapreader.h index b10f35d89..c15a83b6f 100644 --- a/src/resources/mapreader.h +++ b/src/resources/mapreader.h @@ -27,12 +27,6 @@ #include -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - class Map; class Properties; class Tileset; diff --git a/src/textmanager.h b/src/textmanager.h index 019214bb6..1ed88883a 100644 --- a/src/textmanager.h +++ b/src/textmanager.h @@ -25,12 +25,6 @@ #include "guichanfwd.h" -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - class Text; class TextManager -- cgit v1.2.3-70-g09d2