Moved strprintf into stringutils.{h,cpp}

26 files changed, 21 insertions, 36 deletions

diff --git a/src/gui/buy.cpp b/src/gui/buy.cpp
index 0f622aca..5b393a06 100644
--- a/src/gui/buy.cpp
+++ b/src/gui/buy.cpp
@@ -40,7 +40,7 @@
 #include "resources/iteminfo.h"
 
 #include "utils/gettext.h"
-#include "utils/strprintf.h"
+#include "utils/stringutils.h"
 
 BuyDialog::BuyDialog():
     Window(_("Buy")),
diff --git a/src/gui/changeemaildialog.cpp b/src/gui/changeemaildialog.cpp
index 798c172e..b6473612 100644
--- a/src/gui/changeemaildialog.cpp
+++ b/src/gui/changeemaildialog.cpp
@@ -33,7 +33,7 @@
 #include "gui/widgets/textfield.h"
 
 #include "utils/gettext.h"
-#include "utils/strprintf.h"
+#include "utils/stringutils.h"
 
 #include <string>
 #include <sstream>
diff --git a/src/gui/changepassworddialog.cpp b/src/gui/changepassworddialog.cpp
index 42854896..39d992b2 100644
--- a/src/gui/changepassworddialog.cpp
+++ b/src/gui/changepassworddialog.cpp
@@ -34,7 +34,7 @@
 #include "gui/widgets/label.h"
 
 #include "utils/gettext.h"
-#include "utils/strprintf.h"
+#include "utils/stringutils.h"
 
 #include <string>
 #include <sstream>
diff --git a/src/gui/charcreatedialog.cpp b/src/gui/charcreatedialog.cpp
index 8513d573..79ec5c1a 100644
--- a/src/gui/charcreatedialog.cpp
+++ b/src/gui/charcreatedialog.cpp
@@ -46,7 +46,6 @@
 #include "resources/colordb.h"
 
 #include "utils/gettext.h"
-#include "utils/strprintf.h"
 #include "utils/stringutils.h"
 
 #include <guichan/font.hpp>
diff --git a/src/gui/charselectdialog.cpp b/src/gui/charselectdialog.cpp
index afc349ea..ba69a9b3 100644
--- a/src/gui/charselectdialog.cpp
+++ b/src/gui/charselectdialog.cpp
@@ -56,7 +56,6 @@
 #include "resources/colordb.h"
 
 #include "utils/gettext.h"
-#include "utils/strprintf.h"
 #include "utils/stringutils.h"
 
 #include <guichan/font.hpp>
diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index f7acda04..81c2abd8 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -40,7 +40,6 @@
 
 #include "utils/dtor.h"
 #include "utils/stringutils.h"
-#include "utils/strprintf.h"
 
 #include <guichan/focushandler.hpp>
 #include <guichan/focuslistener.hpp>
diff --git a/src/gui/gui.h b/src/gui/gui.h
index d3fb3b60..e4e83468 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -19,12 +19,12 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef GUI
-#define GUI
+#ifndef GUI_H
+#define GUI_H
 
 #include <guichan/gui.hpp>
 
-#include "../guichanfwd.h"
+#include "guichanfwd.h"
 
 class Graphics;
 class GuiConfigListener;
@@ -130,4 +130,4 @@ extern SDLInput *guiInput;                    /**< GUI input */
  */
 extern gcn::Font *boldFont;
 
-#endif
+#endif // GUI_H
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 2b397ed7..fa28bc34 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -40,7 +40,7 @@
 #include "resources/iteminfo.h"
 
 #include "utils/gettext.h"
-#include "utils/strprintf.h"
+#include "utils/stringutils.h"
 
 #include <guichan/font.hpp>
 #include <guichan/mouseinput.hpp>
diff --git a/src/gui/itemamount.cpp b/src/gui/itemamount.cpp
index 518eb761..b3089e34 100644
--- a/src/gui/itemamount.cpp
+++ b/src/gui/itemamount.cpp
@@ -35,7 +35,7 @@
 #include "localplayer.h"
 
 #include "utils/gettext.h"
-#include "utils/strprintf.h"
+#include "utils/stringutils.h"
 
 ItemAmountWindow::ItemAmountWindow(Usage usage, Window *parent, Item *item,
                                    int maxRange):
diff --git a/src/gui/ministatus.h b/src/gui/ministatus.h
index 96ac3d88..56f53908 100644
--- a/src/gui/ministatus.h
+++ b/src/gui/ministatus.h
@@ -38,14 +38,8 @@ class ProgressBar;
 class MiniStatusWindow : public Popup
 {
     public:
-        /**
-         * Constructor.
-         */
         MiniStatusWindow();
 
-        /**
-         * Draw this window.
-         */
         void draw(gcn::Graphics *graphics);
 
         /**
@@ -76,4 +70,3 @@ class MiniStatusWindow : public Popup
 };
 
 #endif
-
diff --git a/src/gui/npcdialog.cpp b/src/gui/npcdialog.cpp
index 1fe231df..e62d9a31 100644
--- a/src/gui/npcdialog.cpp
+++ b/src/gui/npcdialog.cpp
@@ -35,7 +35,7 @@
 #include "net/npchandler.h"
 
 #include "utils/gettext.h"
-#include "utils/strprintf.h"
+#include "utils/stringutils.h"
 
 NpcDialog::NpcDialog()
     : Window(_("NPC")), 
diff --git a/src/gui/partywindow.cpp b/src/gui/partywindow.cpp
index 07f66a2f..b3c6c74c 100644
--- a/src/gui/partywindow.cpp
+++ b/src/gui/partywindow.cpp
@@ -28,7 +28,7 @@
 
 #include "utils/dtor.h"
 #include "utils/gettext.h"
-#include "utils/strprintf.h"
+#include "utils/stringutils.h"
 
 PartyWindow::PartyWindow() : Window(_("Party"))
 {
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index c76a9065..b02e6f2a 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -43,7 +43,7 @@
 #include "resources/iteminfo.h"
 
 #include "utils/gettext.h"
-#include "utils/strprintf.h"
+#include "utils/stringutils.h"
 
 #include <cassert>
 
diff --git a/src/gui/register.cpp b/src/gui/register.cpp
index dabf98fd..6dfc761d 100644
--- a/src/gui/register.cpp
+++ b/src/gui/register.cpp
@@ -38,7 +38,6 @@
 #include "gui/widgets/textfield.h"
 
 #include "utils/gettext.h"
-#include "utils/strprintf.h"
 #include "utils/stringutils.h"
 
 void WrongDataNoticeListener::setTarget(gcn::TextField *textField)
diff --git a/src/gui/sell.cpp b/src/gui/sell.cpp
index f7762144..c9b9d649 100644
--- a/src/gui/sell.cpp
+++ b/src/gui/sell.cpp
@@ -40,7 +40,7 @@
 #include "resources/iteminfo.h"
 
 #include "utils/gettext.h"
-#include "utils/strprintf.h"
+#include "utils/stringutils.h"
 
 SellDialog::SellDialog():
     Window(_("Sell")),
diff --git a/src/gui/skill.cpp b/src/gui/skill.cpp
index d7a95120..44d4c91a 100644
--- a/src/gui/skill.cpp
+++ b/src/gui/skill.cpp
@@ -35,7 +35,7 @@
 
 #include "utils/dtor.h"
 #include "utils/gettext.h"
-#include "utils/strprintf.h"
+#include "utils/stringutils.h"
 #include "utils/xml.h"
 
 static const char *SKILLS_FILE = _("skills.xml");
diff --git a/src/gui/skin.cpp b/src/gui/skin.cpp
index b1665f59..f6eb0d58 100644
--- a/src/gui/skin.cpp
+++ b/src/gui/skin.cpp
@@ -31,7 +31,7 @@
 #include "resources/resourcemanager.h"
 
 #include "utils/dtor.h"
-#include "utils/strprintf.h"
+#include "utils/stringutils.h"
 #include "utils/xml.h"
 
 #include <algorithm>
diff --git a/src/gui/status.cpp b/src/gui/status.cpp
index e91e6bd5..643f5330 100644
--- a/src/gui/status.cpp
+++ b/src/gui/status.cpp
@@ -36,7 +36,6 @@
 
 #include "utils/gettext.h"
 #include "utils/mathutils.h"
-#include "utils/strprintf.h"
 #include "utils/stringutils.h"
 
 StatusWindow::StatusWindow(LocalPlayer *player):
diff --git a/src/gui/statuswindow.cpp b/src/gui/statuswindow.cpp
index 2399efb4..b4e6e770 100644
--- a/src/gui/statuswindow.cpp
+++ b/src/gui/statuswindow.cpp
@@ -28,7 +28,6 @@
 
 #include "localplayer.h"
 
-#include "utils/strprintf.h"
 #include "utils/stringutils.h"
 
 StatusWindow::StatusWindow(LocalPlayer *player):
diff --git a/src/gui/storagewindow.cpp b/src/gui/storagewindow.cpp
index aada0bb2..d779800b 100644
--- a/src/gui/storagewindow.cpp
+++ b/src/gui/storagewindow.cpp
@@ -43,7 +43,7 @@
 #include "resources/iteminfo.h"
 
 #include "utils/gettext.h"
-#include "utils/strprintf.h"
+#include "utils/stringutils.h"
 
 #include <guichan/font.hpp>
 #include <guichan/mouseinput.hpp>
diff --git a/src/gui/trade.cpp b/src/gui/trade.cpp
index 9e39645d..fa662d1a 100644
--- a/src/gui/trade.cpp
+++ b/src/gui/trade.cpp
@@ -42,7 +42,6 @@
 
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
-#include "utils/strprintf.h"
 
 
 #include <sstream>
diff --git a/src/gui/unregisterdialog.cpp b/src/gui/unregisterdialog.cpp
index c0959cc9..6775051e 100644
--- a/src/gui/unregisterdialog.cpp
+++ b/src/gui/unregisterdialog.cpp
@@ -35,7 +35,7 @@
 #include "gui/widgets/textfield.h"
 
 #include "utils/gettext.h"
-#include "utils/strprintf.h"
+#include "utils/stringutils.h"
 
 #include <string>
 #include <sstream>
diff --git a/src/gui/widgets/chattab.cpp b/src/gui/widgets/chattab.cpp
index e96f7738..d55e5da8 100644
--- a/src/gui/widgets/chattab.cpp
+++ b/src/gui/widgets/chattab.cpp
@@ -38,7 +38,6 @@
 #include "resources/itemdb.h"
 
 #include "utils/gettext.h"
-#include "utils/strprintf.h"
 #include "utils/stringutils.h"
 
 #include <guichan/widgets/tabbedarea.hpp>
diff --git a/src/gui/widgets/scrollarea.cpp b/src/gui/widgets/scrollarea.cpp
index 57995ba1..ff3a23d1 100644
--- a/src/gui/widgets/scrollarea.cpp
+++ b/src/gui/widgets/scrollarea.cpp
@@ -278,7 +278,7 @@ void ScrollArea::drawRightButton(gcn::Graphics *graphics)
 
 void ScrollArea::drawVBar(gcn::Graphics *graphics)
 {
-    gcn::Rectangle dim = getVerticalBarDimension();
+    const gcn::Rectangle dim = getVerticalBarDimension();
     graphics->setColor(gcn::Color(0, 0, 0, 32));
     graphics->fillRectangle(dim);
     graphics->setColor(gcn::Color(255, 255, 255));
@@ -286,7 +286,7 @@ void ScrollArea::drawVBar(gcn::Graphics *graphics)
 
 void ScrollArea::drawHBar(gcn::Graphics *graphics)
 {
-    gcn::Rectangle dim = getHorizontalBarDimension();
+    const gcn::Rectangle dim = getHorizontalBarDimension();
     graphics->setColor(gcn::Color(0, 0, 0, 32));
     graphics->fillRectangle(dim);
     graphics->setColor(gcn::Color(255, 255, 255));
diff --git a/src/gui/widgets/whispertab.cpp b/src/gui/widgets/whispertab.cpp
index 5e005709..17ee3fc4 100644
--- a/src/gui/widgets/whispertab.cpp
+++ b/src/gui/widgets/whispertab.cpp
@@ -29,7 +29,7 @@
 #include "net/net.h"
 
 #include "utils/gettext.h"
-#include "utils/strprintf.h"
+#include "utils/stringutils.h"
 
 WhisperTab::WhisperTab(const std::string &nick) :
     ChatTab(nick),
diff --git a/src/gui/widgets/windowcontainer.h b/src/gui/widgets/windowcontainer.h
index a1a4b14c..0e2bf6b7 100644
--- a/src/gui/widgets/windowcontainer.h
+++ b/src/gui/widgets/windowcontainer.h
@@ -54,6 +54,6 @@ class WindowContainer : public Container
         Widgets mDeathList;
 };
 
-extern WindowContainer* windowContainer;
+extern WindowContainer *windowContainer;
 
 #endif