From 3b022084c6d661276b3a5f5151e2bfbf6201cb98 Mon Sep 17 00:00:00 2001
From: Thorbjørn Lindeijer <thorbjorn@lindeijer.nl>
Date: Fri, 10 Feb 2012 22:23:27 +0100
Subject: Arbitrary small code cleanups

Reviewed-by: Erik Schilling
---
 src/gui/widgets/button.h     | 8 ++++----
 src/gui/widgets/desktop.cpp  | 2 +-
 src/gui/widgets/tabbedarea.h | 2 --
 src/sound.cpp                | 2 +-
 src/sound.h                  | 2 +-
 5 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/gui/widgets/button.h b/src/gui/widgets/button.h
index f07bb913..f31c3436 100644
--- a/src/gui/widgets/button.h
+++ b/src/gui/widgets/button.h
@@ -46,7 +46,7 @@ class Button : public gcn::Button
          * adds the given action listener.
          */
         Button(const std::string &caption, const std::string &actionEventId,
-                gcn::ActionListener *listener);
+               gcn::ActionListener *listener);
 
         ~Button();
 
@@ -62,7 +62,7 @@ class Button : public gcn::Button
 
         void adjustSize();
 
-        void setCaption(const std::string& caption);
+        void setCaption(const std::string &caption);
 
         /**
          * Set the icons available next to the text
@@ -72,14 +72,14 @@ class Button : public gcn::Button
          * Standard, Highlighted, Pressed, and Disabled.
          * If the image is too short, the missing states won't be loaded.
          */
-        bool setButtonIcon(const std::string& iconFile = std::string());
+        bool setButtonIcon(const std::string &iconFile);
 
         /**
          * Set the button popup text when hovering it for a few seconds.
          *
          * @note: An empty text will disable the popup.
          */
-        void setButtonPopupText(const std::string& text = std::string())
+        void setButtonPopupText(const std::string &text)
         { mPopupText = text; }
 
         void logic();
diff --git a/src/gui/widgets/desktop.cpp b/src/gui/widgets/desktop.cpp
index baf3e951..ce609891 100644
--- a/src/gui/widgets/desktop.cpp
+++ b/src/gui/widgets/desktop.cpp
@@ -86,7 +86,7 @@ void Desktop::draw(gcn::Graphics *graphics)
 
     if (mWallpaper)
     {
-        if (!mWallpaper->useOpenGL())
+        if (!Image::useOpenGL())
             g->drawImage(mWallpaper,
                 (getWidth() - mWallpaper->getWidth()) / 2,
                 (getHeight() - mWallpaper->getHeight()) / 2);
diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h
index 72ec324d..45b092a4 100644
--- a/src/gui/widgets/tabbedarea.h
+++ b/src/gui/widgets/tabbedarea.h
@@ -68,8 +68,6 @@ class TabbedArea : public gcn::TabbedArea, public gcn::WidgetListener
          */
         gcn::Widget *getCurrentWidget();
 
-        using gcn::TabbedArea::addTab;
-
         /**
          * Add a tab. Overridden since it needs to size the widget.
          *
diff --git a/src/sound.cpp b/src/sound.cpp
index 4f562833..e8348a40 100644
--- a/src/sound.cpp
+++ b/src/sound.cpp
@@ -254,7 +254,7 @@ void Sound::playSfx(const std::string &path, int x, int y)
         return;
 
     std::string tmpPath;
-    if (!path.find("sfx/"))
+    if (!path.compare(0, 4, "sfx/"))
         tmpPath = path;
     else
         tmpPath = paths.getValue("sfx", "sfx/") + path;
diff --git a/src/sound.h b/src/sound.h
index 9f57ffb9..dd368f84 100644
--- a/src/sound.h
+++ b/src/sound.h
@@ -94,7 +94,7 @@ class Sound
         void setSfxVolume(int volume);
 
         /**
-         * Plays an item.
+         * Plays a sound at the specified location.
          *
          * @param path The resource path to the sound file.
          * @param x The vertical distance of the sound in pixels.
-- 
cgit v1.2.3-70-g09d2