From 34a492ac70b3217937eafeb6db3cb9bfdc18fba9 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 25 Nov 2011 01:11:42 +0300
Subject: Move A_UNUSED define to include file.
---
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 ++------
47 files changed, 16 insertions(+), 287 deletions(-)
(limited to 'src/gui')
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 <vector>
-#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 <guichan/actionlistener.hpp>
#include <guichan/selectionlistener.hpp>
-#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 <vector>
#include <set>
-#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 <guichan/actionlistener.hpp>
-#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 <vector>
-#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 <guichan/actionlistener.hpp>
-#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 <guichan/keylistener.hpp>
#include <guichan/selectionlistener.hpp>
-#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 <guichan/keylistener.hpp>
#include <guichan/actionlistener.hpp>
-#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 <vector>
-#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 <guichan/actionlistener.hpp>
-#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 <string>
-#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 <SDL_types.h>
-#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 <string>
-#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 <guichan/actionlistener.hpp>
-#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 <guichan/actionlistener.hpp>
#include <guichan/selectionlistener.hpp>
-#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 <string>
#include <map>
-#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 <map>
-#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 <guichan/mouselistener.hpp>
-#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 <guichan/widgetlistener.hpp>
-#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 <vector>
-#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 <guichan/widgetlistener.hpp>
-#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 <vector>
-#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 <guichan/widgetlistener.hpp>
-#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 <list>
#include <algorithm>
-#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 <guichan/mouselistener.hpp>
-#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 <guichan/widgetlistener.hpp>
-#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 <guichan/widgets/listbox.hpp>
-#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 <guichan/mouselistener.hpp>
#include <guichan/widgetlistener.hpp>
-#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 <guichan/widgets/radiobutton.hpp>
-#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 <guichan/widgets/scrollarea.hpp>
#include <guichan/widgetlistener.hpp>
-#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 <list>
-#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 <map>
#include <set>
-#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 <guichan/widgets/slider.hpp>
-#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 <guichan/mouselistener.hpp>
#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 <string>
-#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 <vector>
-#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 <guichan/widgets/window.hpp>
-#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 <guichan/actionlistener.hpp>
#include <guichan/selectionlistener.hpp>
+#include "localconsts.h"
+
#include <map>
#include <vector>
-#ifdef __GNUC__
-#define A_UNUSED __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
class EmotePopup;
class TextPopup;
--
cgit v1.2.3-70-g09d2