Some rather pedantic changes. Unified all naming for emoticons in the

code so that only one term is used everywhere (to simplify
maintainability), as well as corrected several variable names and
comments where there was copy/pasted code, but it wasn't corrected. Also
moved emote shortcuts back to where they were originally, to reduce
player confusion when the next build comes around.

Signed-off-by: Ira Rice <irarice@gmail.com>

1 files changed, 4 insertions, 5 deletions

diff --git a/src/gui/shortcutcontainer.h b/src/gui/shortcutcontainer.h
index ebc0a9fc..9d0584d3 100644
--- a/src/gui/shortcutcontainer.h
+++ b/src/gui/shortcutcontainer.h
@@ -29,7 +29,6 @@
 #include "../guichanfwd.h"
 
 class Image;
-class Item;
 
 /**
  * An item shortcut container. Used to quickly use items.
@@ -54,7 +53,7 @@ class ShortcutContainer : public gcn::Widget,
         /**
          * Draws the items.
          */
-        virtual void draw(gcn::Graphics *graphics)=0;
+        virtual void draw(gcn::Graphics *graphics) = 0;
 
         /**
          * Invoked when a widget changes its size. This is used to determine
@@ -65,17 +64,17 @@ class ShortcutContainer : public gcn::Widget,
         /**
          * Handles mouse when dragged.
          */
-        virtual void mouseDragged(gcn::MouseEvent &event)=0;
+        virtual void mouseDragged(gcn::MouseEvent &event) = 0;
 
         /**
          * Handles mouse when pressed.
          */
-        virtual void mousePressed(gcn::MouseEvent &event)=0;
+        virtual void mousePressed(gcn::MouseEvent &event) = 0;
 
         /**
          * Handles mouse release.
          */
-        virtual void mouseReleased(gcn::MouseEvent &event)=0;
+        virtual void mouseReleased(gcn::MouseEvent &event) = 0;
 
         virtual int getMaxItems()
         { return mMaxItems; }