Some code style cleanups, as well as uncommented the font setting for

the emote shortcut window (which I meant to test before committing.
Don't remove this line, as text drawing behavior is rather crazy
without it).

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

2 files changed, 6 insertions, 11 deletions

diff --git a/src/gui/emoteshortcutcontainer.cpp b/src/gui/emoteshortcutcontainer.cpp
index 5e984dd5..de9f8bab 100644
--- a/src/gui/emoteshortcutcontainer.cpp
+++ b/src/gui/emoteshortcutcontainer.cpp
@@ -71,7 +71,7 @@ void EmoteShortcutContainer::draw(gcn::Graphics *graphics)
 {
     Graphics *g = static_cast<Graphics*>(graphics);
 
-    //graphics->setFont(getFont());
+    graphics->setFont(getFont());
 
     for (int i = 0; i < mMaxItems; i++)
     {
diff --git a/src/gui/itemshortcutcontainer.cpp b/src/gui/itemshortcutcontainer.cpp
index 7e2eeac0..e66dc04f 100644
--- a/src/gui/itemshortcutcontainer.cpp
+++ b/src/gui/itemshortcutcontainer.cpp
@@ -59,8 +59,7 @@ ItemShortcutContainer::~ItemShortcutContainer()
     mBackgroundImg->decRef();
 }
 
-void
-ItemShortcutContainer::logic()
+void ItemShortcutContainer::logic()
 {
     gcn::Widget::logic();
 
@@ -73,8 +72,7 @@ ItemShortcutContainer::logic()
     }
 }
 
-void
-ItemShortcutContainer::draw(gcn::Graphics *graphics)
+void ItemShortcutContainer::draw(gcn::Graphics *graphics)
 {
     Graphics *g = static_cast<Graphics*>(graphics);
 
@@ -134,8 +132,7 @@ ItemShortcutContainer::draw(gcn::Graphics *graphics)
     }
 }
 
-void
-ItemShortcutContainer::mouseDragged(gcn::MouseEvent &event)
+void ItemShortcutContainer::mouseDragged(gcn::MouseEvent &event)
 {
     if (event.getButton() == gcn::MouseEvent::LEFT) {
         if (!mItemMoved && mItemClicked) {
@@ -160,8 +157,7 @@ ItemShortcutContainer::mouseDragged(gcn::MouseEvent &event)
     }
 }
 
-void
-ItemShortcutContainer::mousePressed(gcn::MouseEvent &event)
+void ItemShortcutContainer::mousePressed(gcn::MouseEvent &event)
 {
     const int index = getIndexFromGrid(event.getX(), event.getY());
     if (index == -1) {
@@ -178,8 +174,7 @@ ItemShortcutContainer::mousePressed(gcn::MouseEvent &event)
     }
 }
 
-void
-ItemShortcutContainer::mouseReleased(gcn::MouseEvent &event)
+void ItemShortcutContainer::mouseReleased(gcn::MouseEvent &event)
 {
     if (event.getButton() == gcn::MouseEvent::LEFT)
     {