4 files changed, 11 insertions, 19 deletions
diff --git a/src/gui/setup_colours.cpp b/src/gui/setup_colours.cpp
index dca47630..b542839a 100644
--- a/src/gui/setup_colours.cpp
+++ b/src/gui/setup_colours.cpp
@@ -35,7 +35,7 @@
 #include "../utils/gettext.h"
 
 Setup_Colours::Setup_Colours() :
-    mColourLabel(_("Colour:")),
+    mColourLabel(_("Color:")),
     mSelected(-1)
 {
     mColourBox = new gcn::ListBox(textColour);
diff --git a/src/gui/setup_players.cpp b/src/gui/setup_players.cpp
index 0f52be41..0e960b84 100644
--- a/src/gui/setup_players.cpp
+++ b/src/gui/setup_players.cpp
@@ -281,8 +281,7 @@ Setup_Players::~Setup_Players(void)
 }
 
 
-void
-Setup_Players::reset()
+void Setup_Players::reset()
 {
     // We now have to search through the list of ignore choices to find the
     // current selection. We could use an index into the table of config
@@ -299,8 +298,7 @@ Setup_Players::reset()
     mIgnoreActionChoicesBox->setSelected(selection);
 }
 
-void
-Setup_Players::apply()
+void Setup_Players::apply()
 {
     player_relations.setPersistIgnores(mPersistIgnores->isSelected());
     player_relations.store();
@@ -312,13 +310,11 @@ Setup_Players::apply()
                                 | (mDefaultWhisper->isSelected()? PlayerRelation::WHISPER : 0));
 }
 
-void
-Setup_Players::cancel()
+void Setup_Players::cancel()
 {
 }
 
-void
-Setup_Players::action(const gcn::ActionEvent &event)
+void Setup_Players::action(const gcn::ActionEvent &event)
 {
     if (event.getId() == ACTION_TABLE) {
         // temporarily eliminate ourselves: we are fully aware of this change,
@@ -352,8 +348,7 @@ Setup_Players::action(const gcn::ActionEvent &event)
     }
 }
 
-void
-Setup_Players::updatedPlayer(const std::string &name)
+void Setup_Players::updatedPlayer(const std::string &name)
 {
     mPlayerTableModel->playerRelationsUpdated();
     mDefaultTrading->setSelected(
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index afc7b1b5..e424c43f 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -353,13 +353,12 @@ void Setup_Video::apply()
     mSpeechBubbleEnabled = config.getValue("speechbubble", 1);
     mNameEnabled = config.getValue("showownname", 0);
     mOpacity = config.getValue("guialpha", 0.8);
-    mOverlayDetail = (int)config.getValue("OverlayDetail", 2);
+    mOverlayDetail = (int) config.getValue("OverlayDetail", 2);
     mOpenGLEnabled = config.getValue("opengl", 0);
 }
 
-int
-Setup_Video::updateSlider(gcn::Slider *slider, gcn::TextField *field,
-                          const std::string &configName)
+int Setup_Video::updateSlider(gcn::Slider *slider, gcn::TextField *field,
+                              const std::string &configName)
 {
     int value;
     std::stringstream temp(field->getText());
@@ -538,8 +537,7 @@ void Setup_Video::action(const gcn::ActionEvent &event)
     }
 }
 
-void
-Setup_Video::keyPressed(gcn::KeyEvent &event)
+void Setup_Video::keyPressed(gcn::KeyEvent &event)
 {
     std::stringstream tempFps(mFpsField->getText());
 
diff --git a/src/gui/shortcutcontainer.cpp b/src/gui/shortcutcontainer.cpp
index 88d9bb22..d03bc809 100644
--- a/src/gui/shortcutcontainer.cpp
+++ b/src/gui/shortcutcontainer.cpp
@@ -58,8 +58,7 @@ void ShortcutContainer::widgetResized(const gcn::Event &event)
     }
 }
 
-int
-ShortcutContainer::getIndexFromGrid(int pointX, int pointY) const
+int ShortcutContainer::getIndexFromGrid(int pointX, int pointY) const
 {
     const gcn::Rectangle tRect = gcn::Rectangle(
         0, 0, mGridWidth * mBoxWidth, mGridHeight * mBoxHeight);