Whitespace fixes

Mainly removed trailing whitespace. Also small fix in header of
recorder.cpp.

12 files changed, 25 insertions, 25 deletions

diff --git a/src/effectmanager.h b/src/effectmanager.h
index a06ecbc7..01c5a6b8 100644
--- a/src/effectmanager.h
+++ b/src/effectmanager.h
@@ -30,7 +30,7 @@ class Being;
 
 class EffectManager
 {
-    public: 
+    public:
         struct EffectDescription
         {
              int id;
diff --git a/src/game.cpp b/src/game.cpp
index 48ca1c73..b79df4f5 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -550,9 +550,9 @@ void Game::handleInput()
                              keyboard.isKeyActive(keyboard.KEY_OK))
                         npcIntegerDialog->action(gcn::ActionEvent(NULL, "ok"));
                     else if (!(keyboard.getKeyValue(
-                                   KeyboardConfig::KEY_TOGGLE_CHAT) == 
+                                   KeyboardConfig::KEY_TOGGLE_CHAT) ==
                                keyboard.getKeyValue(
-                                   KeyboardConfig::KEY_OK) && 
+                                   KeyboardConfig::KEY_OK) &&
                                (npcStringDialog->isVisible() ||
                                 npcTextDialog->isVisible() ||
                                 npcListDialog->isVisible() ||
@@ -595,7 +595,7 @@ void Game::handleInput()
                     break;
                // Quitting confirmation dialog
                case KeyboardConfig::KEY_QUIT:
-                    if (!exitConfirm) 
+                    if (!exitConfirm)
                     {
                         exitConfirm = new ConfirmDialog( _("Quit"),
                                                          _("Are you sure you "
diff --git a/src/gui/itempopup.cpp b/src/gui/itempopup.cpp
index df7afa48..200679d1 100644
--- a/src/gui/itempopup.cpp
+++ b/src/gui/itempopup.cpp
@@ -108,7 +108,7 @@ void ItemPopup::setItem(const ItemInfo &item)
     mItemName->setWidth(boldFont->getWidth(item.getName()));
     mItemDesc->setTextWrapped(item.getDescription(), 196);
     mItemEffect->setTextWrapped(item.getEffect(), 196);
-    mItemWeight->setTextWrapped(_("Weight: ") + toString(item.getWeight()) + 
+    mItemWeight->setTextWrapped(_("Weight: ") + toString(item.getWeight()) +
                                 _(" grams"), 196);
 
     int minWidth = mItemName->getWidth();
@@ -138,7 +138,7 @@ void ItemPopup::setItem(const ItemInfo &item)
 
     if (item.getEffect() == "")
     {
-        setContentSize(minWidth, (numRowsDesc * getFont()->getHeight() + 
+        setContentSize(minWidth, (numRowsDesc * getFont()->getHeight() +
                       (3 * getFont()->getHeight())));
 
         mItemWeightScroll->setPosition(2,
@@ -147,7 +147,7 @@ void ItemPopup::setItem(const ItemInfo &item)
     }
     else
     {
-        setContentSize(minWidth, (numRowsDesc * getFont()->getHeight()) + 
+        setContentSize(minWidth, (numRowsDesc * getFont()->getHeight()) +
                       (numRowsEffect * getFont()->getHeight()) +
                       (3 * getFont()->getHeight()));
 
diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index 55cd8b5d..ccadf3e1 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -75,7 +75,7 @@ void Minimap::setMapImage(Image *img)
 
         setMinWidth(mapWidth > titleWidth ? mapWidth : titleWidth);
         setMinHeight(mapHeight);
-        setMaxWidth(mMapImage->getWidth() > titleWidth ? 
+        setMaxWidth(mMapImage->getWidth() > titleWidth ?
                     mMapImage->getWidth() + offsetX : titleWidth);
         setMaxHeight(mMapImage->getHeight() + offsetY);
 
diff --git a/src/gui/recorder.cpp b/src/gui/recorder.cpp
index 153bffae..bebd3e19 100644
--- a/src/gui/recorder.cpp
+++ b/src/gui/recorder.cpp
@@ -15,7 +15,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
@@ -40,7 +40,7 @@ Recorder::Recorder(ChatWindow *chat, const std::string &title,
 
     mChat = chat;
     Button *button = new Button(buttonTxt, "activate", this);
-    setDefaultSize(0, windowContainer->getHeight() - 123 - button->getHeight() - 
+    setDefaultSize(0, windowContainer->getHeight() - 123 - button->getHeight() -
                    offsetY,  button->getWidth() + offsetX, button->getHeight() +
                    offsetY);
 
@@ -99,7 +99,7 @@ void Recorder::changeRecordingStatus(const std::string &msg)
          */
         mChat->chatLog(_("Starting to record..."), BY_SERVER);
         std::string file = std::string(PHYSFS_getUserDir()) + "/.aethyra/" + msgCopy;
-        
+
         mStream.open(file.c_str(), std::ios_base::trunc);
 
         if (mStream.is_open())
@@ -113,4 +113,3 @@ void Recorder::action(const gcn::ActionEvent &event)
 {
     changeRecordingStatus("");
 }
-
diff --git a/src/gui/setup_players.cpp b/src/gui/setup_players.cpp
index 5c19bd2b..d25117de 100644
--- a/src/gui/setup_players.cpp
+++ b/src/gui/setup_players.cpp
@@ -241,7 +241,7 @@ Setup_Players::Setup_Players():
     mIgnoreActionChoicesBox = new DropDown(ignoreChoices, new ScrollArea(),
                                            new ListBox(ignoreChoices), false);
 
-    for (int i = 0; i < COLUMNS_NR; i++) 
+    for (int i = 0; i < COLUMNS_NR; i++)
     {
         mPlayerTableTitleModel->set(0, i,
                 new gcn::Label(gettext(table_titles[i])));
diff --git a/src/gui/setup_players.h b/src/gui/setup_players.h
index 2edc6983..74247b77 100644
--- a/src/gui/setup_players.h
+++ b/src/gui/setup_players.h
@@ -32,8 +32,9 @@ class GuiTable;
 class PlayerTableModel;
 class StaticTableModel;
 
-class Setup_Players : public SetupTab, 
-                      public gcn::ActionListener, public PlayerRelationsListener
+class Setup_Players : public SetupTab,
+                      public gcn::ActionListener,
+                      public PlayerRelationsListener
 {
 public:
     Setup_Players();
diff --git a/src/gui/shortcutwindow.cpp b/src/gui/shortcutwindow.cpp
index 5d49a3c6..b6987b3e 100644
--- a/src/gui/shortcutwindow.cpp
+++ b/src/gui/shortcutwindow.cpp
@@ -50,7 +50,7 @@ ShortcutWindow::ShortcutWindow(const char *title, ShortcutContainer *content)
     const int width = (int) config.getValue("screenwidth", 800);
     const int height = (int) config.getValue("screenheight", 600);
 
-    setDefaultSize(width - (mInstances * mItems->getBoxWidth()) - 
+    setDefaultSize(width - (mInstances * mItems->getBoxWidth()) -
                    (mInstances * border),  height - (mItems->getBoxHeight() *
                    mItems->getMaxItems()) - border, mItems->getBoxWidth() +
                    border, (mItems->getBoxHeight() * mItems->getMaxItems()) +
diff --git a/src/gui/speechbubble.cpp b/src/gui/speechbubble.cpp
index c76558e4..dd404a63 100644
--- a/src/gui/speechbubble.cpp
+++ b/src/gui/speechbubble.cpp
@@ -85,7 +85,7 @@ void SpeechBubble::setText(std::string mText)
         width = mSpeechBox->getMinWidth();
 
     setContentSize(width + fontHeight, (numRows * fontHeight) + 6);
-    mSpeechArea->setDimension(gcn::Rectangle(4, fontHeight + 3, width + 5, 
+    mSpeechArea->setDimension(gcn::Rectangle(4, fontHeight + 3, width + 5,
                                             (numRows * fontHeight)));
 }
 
diff --git a/src/gui/status.cpp b/src/gui/status.cpp
index e8426ec4..683a9a41 100644
--- a/src/gui/status.cpp
+++ b/src/gui/status.cpp
@@ -132,7 +132,7 @@ StatusWindow::StatusWindow(LocalPlayer *player):
     place(0, 0, mStatsTitleLabel, 5);
     place(5, 1, mStatsTotalLabel, 5);
     place(12, 1, mStatsCostLabel, 5);
-    for(int i = 0; i < 6; i++)
+    for (int i = 0; i < 6; i++)
     {
         place(0, 2 + i, mStatsLabel[i], 7).setPadding(5);
         place(7, 2 + i, mStatsDisplayLabel[i]).setPadding(5);
diff --git a/src/gui/widgets/tab.cpp b/src/gui/widgets/tab.cpp
index 22e952e7..21402c89 100644
--- a/src/gui/widgets/tab.cpp
+++ b/src/gui/widgets/tab.cpp
@@ -51,10 +51,10 @@ struct TabData
 };
 
 static TabData const data[TAB_COUNT] = {
-    {"graphics/gui/tab.png", 0, 0},
-    {"graphics/gui/tab.png", 9, 4},
-    {"graphics/gui/tabselected.png", 16, 19},
-    {"graphics/gui/tab.png", 25, 23}
+    { "graphics/gui/tab.png", 0, 0 },
+    { "graphics/gui/tab.png", 9, 4 },
+    { "graphics/gui/tabselected.png", 16, 19 },
+    { "graphics/gui/tab.png", 25, 23 }
 };
 
 ImageRect Tab::tabImg[TAB_COUNT];
@@ -117,7 +117,7 @@ void Tab::draw(gcn::Graphics *graphics)
     // check which type of tab to draw
     if (mTabbedArea)
     {
-        if(mTabbedArea->isTabSelected(this))
+        if (mTabbedArea->isTabSelected(this))
         {
             mode = TAB_SELECTED;
             // if tab is selected, it doesnt need to highlight activity
diff --git a/src/keyboardconfig.cpp b/src/keyboardconfig.cpp
index 6405966c..5a0c0678 100644
--- a/src/keyboardconfig.cpp
+++ b/src/keyboardconfig.cpp
@@ -150,8 +150,8 @@ bool KeyboardConfig::hasConflicts()
         for (j = i, j++; j < KEY_TOTAL; j++)
         {
             // Allow for item shortcut and emote keys to overlap, but no other keys
-            if (!((((i >= KEY_SHORTCUT_1) && (i <= KEY_SHORTCUT_12)) && 
-                   ((j >= KEY_EMOTE_1) && (j <= KEY_EMOTE_12))) || 
+            if (!((((i >= KEY_SHORTCUT_1) && (i <= KEY_SHORTCUT_12)) &&
+                   ((j >= KEY_EMOTE_1) && (j <= KEY_EMOTE_12))) ||
                    ((i == KEY_TOGGLE_CHAT) && (j == KEY_OK))) &&
                    (mKey[i].value == mKey[j].value)
                )