summaryrefslogtreecommitdiff
path: root/src/gui/widgets
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-11-25 01:11:42 +0300
committerAndrei Karas <akaras@inbox.ru>2011-11-25 01:11:42 +0300
commit34a492ac70b3217937eafeb6db3cb9bfdc18fba9 (patch)
treecb3e079f7a830881f0b2810ed69557669704eb81 /src/gui/widgets
parentb8e720a33502700b42569f152d63badd26d4a9b3 (diff)
downloadManaVerse-34a492ac70b3217937eafeb6db3cb9bfdc18fba9.tar.gz
ManaVerse-34a492ac70b3217937eafeb6db3cb9bfdc18fba9.tar.bz2
ManaVerse-34a492ac70b3217937eafeb6db3cb9bfdc18fba9.tar.xz
ManaVerse-34a492ac70b3217937eafeb6db3cb9bfdc18fba9.zip
Move A_UNUSED define to include file.
Diffstat (limited to 'src/gui/widgets')
-rw-r--r--src/gui/widgets/chattab.h10
-rw-r--r--src/gui/widgets/checkbox.h6
-rw-r--r--src/gui/widgets/desktop.h6
-rw-r--r--src/gui/widgets/dropshortcutcontainer.h6
-rw-r--r--src/gui/widgets/emoteshortcutcontainer.h6
-rw-r--r--src/gui/widgets/flowcontainer.h6
-rw-r--r--src/gui/widgets/guitable.h6
-rw-r--r--src/gui/widgets/horizontcontainer.h6
-rw-r--r--src/gui/widgets/inventoryfilter.h6
-rw-r--r--src/gui/widgets/itemcontainer.h6
-rw-r--r--src/gui/widgets/itemlinkhandler.h11
-rw-r--r--src/gui/widgets/itemshortcutcontainer.h6
-rw-r--r--src/gui/widgets/layouthelper.h6
-rw-r--r--src/gui/widgets/listbox.h6
-rw-r--r--src/gui/widgets/popup.h6
-rw-r--r--src/gui/widgets/radiobutton.h6
-rw-r--r--src/gui/widgets/scrollarea.h6
-rw-r--r--src/gui/widgets/setupitem.h6
-rw-r--r--src/gui/widgets/setuptabscroll.h6
-rw-r--r--src/gui/widgets/shoplistbox.h8
-rw-r--r--src/gui/widgets/shortcutcontainer.h9
-rw-r--r--src/gui/widgets/slider.h6
-rw-r--r--src/gui/widgets/spellshortcutcontainer.h7
-rw-r--r--src/gui/widgets/tabbedarea.h6
-rw-r--r--src/gui/widgets/vertcontainer.h6
-rw-r--r--src/gui/widgets/window.h6
26 files changed, 11 insertions, 160 deletions
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;