From a84133850af6d348c0c4e252b26618148702153b Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Thu, 20 Sep 2007 13:24:20 +0000
Subject: Merged a bunch of small changes from trunk to 0.0 and set
 svn:eol-style to native for some files that were still missing this property.
 This is a feeble attempt to reduce the amount of conflicts for future merges.

---
 src/gui/gui.cpp                |  6 +++---
 src/gui/newskill.cpp           |  2 +-
 src/gui/playerbox.cpp          |  4 ++--
 src/gui/progressbar.cpp        |  5 ++---
 src/gui/vbox.cpp               |  2 +-
 src/gui/widgets/resizegrip.cpp |  2 +-
 src/gui/window.h               | 10 +++++-----
 7 files changed, 15 insertions(+), 16 deletions(-)

(limited to 'src/gui')

diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 84680da8..a83f794c 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -206,9 +206,9 @@ Gui::draw()
             mCustomCursor)
     {
         static_cast<Graphics*>(mGraphics)->drawImage(
-            mMouseCursors->get(mCursorType),
-            mouseX - 15,
-            mouseY - 17);
+                mMouseCursors->get(mCursorType),
+                mouseX - 15,
+                mouseY - 17);
     }
 
     mGraphics->popClipArea();
diff --git a/src/gui/newskill.cpp b/src/gui/newskill.cpp
index c84c9449..6783a546 100644
--- a/src/gui/newskill.cpp
+++ b/src/gui/newskill.cpp
@@ -123,7 +123,7 @@ NewSkillDialog::NewSkillDialog():
 
 void NewSkillDialog::action(const gcn::ActionEvent &event)
 {
-     int osp = startPoint;
+    int osp = startPoint;
     if (event.getId() == "close")
     {
         setVisible(false);
diff --git a/src/gui/playerbox.cpp b/src/gui/playerbox.cpp
index fad156f1..95366bee 100644
--- a/src/gui/playerbox.cpp
+++ b/src/gui/playerbox.cpp
@@ -80,7 +80,7 @@ PlayerBox::draw(gcn::Graphics *graphics)
     if (mPlayer)
     {
         // Draw character
-        mPlayer->draw(dynamic_cast<Graphics*>(graphics), 40, 42);
+        mPlayer->draw(static_cast<Graphics*>(graphics), 40, 42);
     }
 }
 
@@ -92,5 +92,5 @@ PlayerBox::drawBorder(gcn::Graphics *graphics)
     w = getWidth() + bs * 2;
     h = getHeight() + bs * 2;
 
-    dynamic_cast<Graphics*>(graphics)->drawImageRect(0, 0, w, h, background);
+    static_cast<Graphics*>(graphics)->drawImageRect(0, 0, w, h, background);
 }
diff --git a/src/gui/progressbar.cpp b/src/gui/progressbar.cpp
index 2bdfc856..6d18b2f7 100644
--- a/src/gui/progressbar.cpp
+++ b/src/gui/progressbar.cpp
@@ -93,9 +93,8 @@ void ProgressBar::logic()
 void
 ProgressBar::draw(gcn::Graphics *graphics)
 {
-    dynamic_cast<Graphics*>(graphics)->drawImageRect(0, 0,
-            getWidth(), getHeight(),
-            mBorder);
+    static_cast<Graphics*>(graphics)->
+        drawImageRect(0, 0, getWidth(), getHeight(), mBorder);
 
     // The bar
     if (mProgress > 0)
diff --git a/src/gui/vbox.cpp b/src/gui/vbox.cpp
index eb838ead..b503508e 100644
--- a/src/gui/vbox.cpp
+++ b/src/gui/vbox.cpp
@@ -25,7 +25,7 @@
 
 void VBox::draw(gcn::Graphics *graphics)
 {
-    if (mWidgets.size() == 0)
+    if (mWidgets.empty())
     {
         return;
     }
diff --git a/src/gui/widgets/resizegrip.cpp b/src/gui/widgets/resizegrip.cpp
index 50a6fce4..6be50f2c 100644
--- a/src/gui/widgets/resizegrip.cpp
+++ b/src/gui/widgets/resizegrip.cpp
@@ -61,5 +61,5 @@ ResizeGrip::~ResizeGrip()
 void
 ResizeGrip::draw(gcn::Graphics *graphics)
 {
-    dynamic_cast<Graphics*>(graphics)->drawImage(gripImage, 0, 0);
+    static_cast<Graphics*>(graphics)->drawImage(gripImage, 0, 0);
 }
diff --git a/src/gui/window.h b/src/gui/window.h
index b83aa78b..583601ab 100644
--- a/src/gui/window.h
+++ b/src/gui/window.h
@@ -52,11 +52,11 @@ class Window : public gcn::Window
          * Constructor. Initializes the title to the given text and hooks
          * itself into the window container.
          *
-         * @param text   The initial window title, "Window" by default.
-         * @param modal  Block input to other windows.
-         * @param parent The parent window. This is the window standing above
-         *               this one in the window hiearchy. When reordering,
-         *               a window will never go below its parent window.
+         * @param caption The initial window title, "Window" by default.
+         * @param modal   Block input to other windows.
+         * @param parent  The parent window. This is the window standing above
+         *                this one in the window hiearchy. When reordering,
+         *                a window will never go below its parent window.
          */
         Window(const std::string &caption = "Window", bool modal = false,
                 Window *parent = NULL);
-- 
cgit v1.2.3-70-g09d2