Remove undescore from variables and defines.

49 files changed, 98 insertions, 98 deletions

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;