Remove undescore from variables and defines.

17 files changed, 55 insertions, 55 deletions

diff --git a/src/guichan/defaultfont.cpp b/src/guichan/defaultfont.cpp
index 4306c7928..f67b66495 100644
--- a/src/guichan/defaultfont.cpp
+++ b/src/guichan/defaultfont.cpp
@@ -67,7 +67,7 @@ namespace gcn
     }
 
     int DefaultFont::drawGlyph(Graphics* graphics,
-                               unsigned char glyph _UNUSED_, int x, int y)
+                               unsigned char glyph A_UNUSED, int x, int y)
     {
         graphics->drawRectangle( Rectangle(x, y, 8, 8));
 
diff --git a/src/guichan/include/guichan/defaultfont.hpp b/src/guichan/include/guichan/defaultfont.hpp
index e5a830e4c..3f6379cbe 100644
--- a/src/guichan/include/guichan/defaultfont.hpp
+++ b/src/guichan/include/guichan/defaultfont.hpp
@@ -48,9 +48,9 @@
 #include "guichan/platform.hpp"
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 namespace gcn
diff --git a/src/guichan/include/guichan/focuslistener.hpp b/src/guichan/include/guichan/focuslistener.hpp
index 8e3f63d71..548d05f4d 100644
--- a/src/guichan/include/guichan/focuslistener.hpp
+++ b/src/guichan/include/guichan/focuslistener.hpp
@@ -50,9 +50,9 @@
 #include "guichan/platform.hpp"
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 namespace gcn
@@ -78,14 +78,14 @@ namespace gcn
          *
          * @param event Discribes the event.
          */
-        virtual void focusGained(const Event& event _UNUSED_) { };
+        virtual void focusGained(const Event& event A_UNUSED) { };
 
         /**
          * Called when a widget loses focus. 
          *
          * @param event Discribes the event.
          */
-        virtual void focusLost(const Event& event _UNUSED_) { };
+        virtual void focusLost(const Event& event A_UNUSED) { };
 
     protected:
         /**
diff --git a/src/guichan/include/guichan/keylistener.hpp b/src/guichan/include/guichan/keylistener.hpp
index caeed0da4..5449f2de4 100644
--- a/src/guichan/include/guichan/keylistener.hpp
+++ b/src/guichan/include/guichan/keylistener.hpp
@@ -48,9 +48,9 @@
 #include "guichan/platform.hpp"
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 namespace gcn
@@ -78,14 +78,14 @@ namespace gcn
          *
          * @param keyEvent Discribes the event.
          */
-        virtual void keyPressed(KeyEvent& keyEvent _UNUSED_) { }
+        virtual void keyPressed(KeyEvent& keyEvent A_UNUSED) { }
 
         /**
          * Called if a key is released when the widget has keyboard focus.
          *
          * @param keyEvent Discribes the event.
          */
-        virtual void keyReleased(KeyEvent& keyEvent _UNUSED_) { }
+        virtual void keyReleased(KeyEvent& keyEvent A_UNUSED) { }
 
     protected:
         /**
diff --git a/src/guichan/include/guichan/mouselistener.hpp b/src/guichan/include/guichan/mouselistener.hpp
index 152d3494e..1612cc822 100644
--- a/src/guichan/include/guichan/mouselistener.hpp
+++ b/src/guichan/include/guichan/mouselistener.hpp
@@ -48,9 +48,9 @@
 #include "guichan/platform.hpp"
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 namespace gcn
@@ -76,7 +76,7 @@ namespace gcn
          * @param mouseEvent Describes the event.
          * @since 0.6.0
          */
-        virtual void mouseEntered(MouseEvent& mouseEvent _UNUSED_)
+        virtual void mouseEntered(MouseEvent& mouseEvent A_UNUSED)
         {
 
         }
@@ -87,7 +87,7 @@ namespace gcn
          * @param mouseEvent Describes the event.
          * @since 0.6.0
          */
-        virtual void mouseExited(MouseEvent& mouseEvent _UNUSED_)
+        virtual void mouseExited(MouseEvent& mouseEvent A_UNUSED)
         {
 
         }
@@ -101,7 +101,7 @@ namespace gcn
          * @param mouseEvent Describes the event.
          * @since 0.6.0
          */
-        virtual void mousePressed(MouseEvent& mouseEvent _UNUSED_)
+        virtual void mousePressed(MouseEvent& mouseEvent A_UNUSED)
         {
 
         }
@@ -112,7 +112,7 @@ namespace gcn
          * @param mouseEvent Describes the event.
          * @since 0.6.0
          */
-        virtual void mouseReleased(MouseEvent& mouseEvent _UNUSED_)
+        virtual void mouseReleased(MouseEvent& mouseEvent A_UNUSED)
         {
 
         }
@@ -124,7 +124,7 @@ namespace gcn
          * @param mouseEvent Describes the event.
          * @since 0.6.0
          */
-        virtual void mouseClicked(MouseEvent& mouseEvent _UNUSED_)
+        virtual void mouseClicked(MouseEvent& mouseEvent A_UNUSED)
         {
 
         }
@@ -135,7 +135,7 @@ namespace gcn
          * @param mouseEvent Describes the event.
          * @since 0.6.0
          */
-        virtual void mouseWheelMovedUp(MouseEvent& mouseEvent _UNUSED_)
+        virtual void mouseWheelMovedUp(MouseEvent& mouseEvent A_UNUSED)
         {
 
         }
@@ -146,7 +146,7 @@ namespace gcn
          * @param mousEvent Describes the event.
          * @since 0.6.0
          */
-        virtual void mouseWheelMovedDown(MouseEvent& mouseEvent _UNUSED_)
+        virtual void mouseWheelMovedDown(MouseEvent& mouseEvent A_UNUSED)
         {
 
         }
@@ -158,7 +158,7 @@ namespace gcn
          * @param mouseEvent Describes the event.
          * @since 0.6.0
          */
-        virtual void mouseMoved(MouseEvent& mouseEvent _UNUSED_)
+        virtual void mouseMoved(MouseEvent& mouseEvent A_UNUSED)
         {
 
         }
@@ -170,7 +170,7 @@ namespace gcn
          * @param mouseEvent Describes the event.
          * @since 0.6.0
          */
-        virtual void mouseDragged(MouseEvent& mouseEvent _UNUSED_)
+        virtual void mouseDragged(MouseEvent& mouseEvent A_UNUSED)
         {
 
         }
diff --git a/src/guichan/include/guichan/selectionlistener.hpp b/src/guichan/include/guichan/selectionlistener.hpp
index 139c46128..8ea8a579b 100644
--- a/src/guichan/include/guichan/selectionlistener.hpp
+++ b/src/guichan/include/guichan/selectionlistener.hpp
@@ -50,9 +50,9 @@
 #include "guichan/platform.hpp"
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 namespace gcn
@@ -85,7 +85,7 @@ namespace gcn
          * @param event The event of the value change.
          * @since 0.8.0
          */
-        virtual void valueChanged(const SelectionEvent& event _UNUSED_)
+        virtual void valueChanged(const SelectionEvent& event A_UNUSED)
         { };
 
     protected:
diff --git a/src/guichan/include/guichan/widget.hpp b/src/guichan/include/guichan/widget.hpp
index ccb56ea70..d112022e3 100644
--- a/src/guichan/include/guichan/widget.hpp
+++ b/src/guichan/include/guichan/widget.hpp
@@ -52,9 +52,9 @@
 #include "guichan/rectangle.hpp"
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 namespace gcn
@@ -894,7 +894,7 @@ namespace gcn
          * @see moveToBottom
          * @since 0.1.0
          */
-        virtual void moveToTop(Widget* widget _UNUSED_) { };
+        virtual void moveToTop(Widget* widget A_UNUSED) { };
 
         /**
          * Moves a widget in this widget to the bottom of this widget.
@@ -904,7 +904,7 @@ namespace gcn
          * @see moveToTop
          * @since 0.1.0
          */
-        virtual void moveToBottom(Widget* widget _UNUSED_) { };
+        virtual void moveToBottom(Widget* widget A_UNUSED) { };
 
         /**
          * Focuses the next widget in the widget.
@@ -930,8 +930,8 @@ namespace gcn
          * @param area The area to show.
          * @since 0.1.0
          */
-        virtual void showWidgetPart(Widget* widget _UNUSED_,
-                                    Rectangle area _UNUSED_)
+        virtual void showWidgetPart(Widget* widget A_UNUSED,
+                                    Rectangle area A_UNUSED)
         { };
 
         /**
diff --git a/src/guichan/include/guichan/widgetlistener.hpp b/src/guichan/include/guichan/widgetlistener.hpp
index eb1f838ec..159549ede 100644
--- a/src/guichan/include/guichan/widgetlistener.hpp
+++ b/src/guichan/include/guichan/widgetlistener.hpp
@@ -50,9 +50,9 @@
 #include "guichan/platform.hpp"
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 namespace gcn
@@ -81,7 +81,7 @@ namespace gcn
          * @param event Describes the event.
          * @since 0.8.0
          */
-        virtual void widgetResized(const Event& event _UNUSED_) { }
+        virtual void widgetResized(const Event& event A_UNUSED) { }
 
         /**
          * Invoked when a widget is moved.
@@ -89,7 +89,7 @@ namespace gcn
          * @param event Describes the event.
          * @since 0.8.0
          */
-        virtual void widgetMoved(const Event& event _UNUSED_) { }
+        virtual void widgetMoved(const Event& event A_UNUSED) { }
 
         /**
          * Invoked when a widget is hidden, i.e it's set to be
@@ -98,7 +98,7 @@ namespace gcn
          * @param event Describes the event.
          * @since 0.8.0
          */
-        virtual void widgetHidden(const Event& event _UNUSED_) { }
+        virtual void widgetHidden(const Event& event A_UNUSED) { }
 
         /**
          * Invoked when a widget is shown, i.e it's set to be
@@ -107,7 +107,7 @@ namespace gcn
          * @param event Describes the event.
          * @since 0.8.0
          */
-        virtual void widgetShown(const Event& event _UNUSED_) { }
+        virtual void widgetShown(const Event& event A_UNUSED) { }
 
     protected:
         /**
diff --git a/src/guichan/include/guichan/widgets/button.hpp b/src/guichan/include/guichan/widgets/button.hpp
index 05b961b1e..c0d0a237d 100644
--- a/src/guichan/include/guichan/widgets/button.hpp
+++ b/src/guichan/include/guichan/widgets/button.hpp
@@ -55,9 +55,9 @@
 #include "guichan/widget.hpp"
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 namespace gcn
diff --git a/src/guichan/include/guichan/widgets/dropdown.hpp b/src/guichan/include/guichan/widgets/dropdown.hpp
index 5853783e5..c096bb03f 100644
--- a/src/guichan/include/guichan/widgets/dropdown.hpp
+++ b/src/guichan/include/guichan/widgets/dropdown.hpp
@@ -58,9 +58,9 @@
 #include "guichan/widgets/scrollarea.hpp"
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 namespace gcn
diff --git a/src/guichan/include/guichan/widgets/tab.hpp b/src/guichan/include/guichan/widgets/tab.hpp
index d123bac15..91c09e270 100644
--- a/src/guichan/include/guichan/widgets/tab.hpp
+++ b/src/guichan/include/guichan/widgets/tab.hpp
@@ -52,9 +52,9 @@
 #include "guichan/platform.hpp"
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 namespace gcn
diff --git a/src/guichan/include/guichan/widgets/window.hpp b/src/guichan/include/guichan/widgets/window.hpp
index 63685c7fb..3b9c62160 100644
--- a/src/guichan/include/guichan/widgets/window.hpp
+++ b/src/guichan/include/guichan/widgets/window.hpp
@@ -51,9 +51,9 @@
 #include "guichan/widgets/container.hpp"
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 namespace gcn
diff --git a/src/guichan/widget.cpp b/src/guichan/widget.cpp
index 6c02384b9..e2ed26508 100644
--- a/src/guichan/widget.cpp
+++ b/src/guichan/widget.cpp
@@ -601,7 +601,7 @@ namespace gcn
         return mFocusHandler->getModalMouseInputFocused() == this;
     }
 
-    Widget *Widget::getWidgetAt(int x _UNUSED_, int y _UNUSED_)
+    Widget *Widget::getWidgetAt(int x A_UNUSED, int y A_UNUSED)
     {
         return NULL;
     }
diff --git a/src/guichan/widgets/button.cpp b/src/guichan/widgets/button.cpp
index 76d69bf2d..184b6235c 100644
--- a/src/guichan/widgets/button.cpp
+++ b/src/guichan/widgets/button.cpp
@@ -223,12 +223,12 @@ namespace gcn
         }
     }
 
-    void Button::mouseExited(MouseEvent& mouseEvent _UNUSED_)
+    void Button::mouseExited(MouseEvent& mouseEvent A_UNUSED)
     {
         mHasMouse = false;
     }
 
-    void Button::mouseEntered(MouseEvent& mouseEvent _UNUSED_)
+    void Button::mouseEntered(MouseEvent& mouseEvent A_UNUSED)
     {
         mHasMouse = true;
     }
@@ -281,7 +281,7 @@ namespace gcn
         }
     }
 
-    void Button::focusLost(const Event& event _UNUSED_)
+    void Button::focusLost(const Event& event A_UNUSED)
     {
         mMousePressed = false;
         mKeyPressed = false;
diff --git a/src/guichan/widgets/dropdown.cpp b/src/guichan/widgets/dropdown.cpp
index e02f0fa3b..7af01e703 100644
--- a/src/guichan/widgets/dropdown.cpp
+++ b/src/guichan/widgets/dropdown.cpp
@@ -436,7 +436,7 @@ namespace gcn
         }
     }
 
-    void DropDown::focusLost(const Event& event _UNUSED_)
+    void DropDown::focusLost(const Event& event A_UNUSED)
     {
         foldUp();
         mInternalFocusHandler.focusNone();
@@ -451,7 +451,7 @@ namespace gcn
         BasicContainer::death(event);
     }
 
-    void DropDown::action(const ActionEvent& actionEvent _UNUSED_)
+    void DropDown::action(const ActionEvent& actionEvent A_UNUSED)
     {
         foldUp();
         releaseModalMouseInputFocus();
@@ -543,7 +543,7 @@ namespace gcn
             mListBox->setSelectionColor(color);
     }
 
-    void DropDown::valueChanged(const SelectionEvent& event _UNUSED_)
+    void DropDown::valueChanged(const SelectionEvent& event A_UNUSED)
     {
         distributeValueChangedEvent();
     }
diff --git a/src/guichan/widgets/tab.cpp b/src/guichan/widgets/tab.cpp
index 61efbd5b0..1a3df3ede 100644
--- a/src/guichan/widgets/tab.cpp
+++ b/src/guichan/widgets/tab.cpp
@@ -168,12 +168,12 @@ namespace gcn
         graphics->popClipArea();
     }
 
-    void Tab::mouseEntered(MouseEvent& mouseEvent _UNUSED_)
+    void Tab::mouseEntered(MouseEvent& mouseEvent A_UNUSED)
     {
         mHasMouse = true;
     }
 
-    void Tab::mouseExited(MouseEvent& mouseEvent _UNUSED_)
+    void Tab::mouseExited(MouseEvent& mouseEvent A_UNUSED)
     {
         mHasMouse = false;
     }
diff --git a/src/guichan/widgets/window.cpp b/src/guichan/widgets/window.cpp
index a26c38541..4779fb0ce 100644
--- a/src/guichan/widgets/window.cpp
+++ b/src/guichan/widgets/window.cpp
@@ -230,7 +230,7 @@ namespace gcn
         mMoved = mouseEvent.getY() <= (int)mTitleBarHeight;
     }
 
-    void Window::mouseReleased(MouseEvent& mouseEvent _UNUSED_)
+    void Window::mouseReleased(MouseEvent& mouseEvent A_UNUSED)
     {
         mMoved = false;
     }