4 files changed, 10 insertions, 7 deletions
diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index 7ad727ff..14a2dd49 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -412,9 +412,10 @@ void ChatWindow::setRecordingFile(const std::string &msg)
     mRecorder->setRecordingFile(msg);
 }
 
-void ChatWindow::whisper(std::string nick, std::string mes, bool own)
+void ChatWindow::whisper(const std::string &nick, std::string mes, bool own)
 {
-    if (mes.length() == 0) return;
+    if (mes.length() == 0)
+        return;
 
     std::string playerName = player_node->getName();
     std::string tempNick = nick;
@@ -453,7 +454,7 @@ void ChatWindow::whisper(std::string nick, std::string mes, bool own)
     }
 }
 
-ChatTab *ChatWindow::addWhisperTab(std::string nick)
+ChatTab *ChatWindow::addWhisperTab(const std::string &nick)
 {
     std::string playerName = player_node->getName();
     std::string tempNick = nick;
diff --git a/src/gui/chat.h b/src/gui/chat.h
index 9f762f8e..21f80f13 100644
--- a/src/gui/chat.h
+++ b/src/gui/chat.h
@@ -171,9 +171,10 @@ class ChatWindow : public Window,
 
         void doPresent();
 
-        void whisper(std::string nick, std::string mes, bool own = false);
+        void whisper(const std::string &nick, std::string mes,
+                     bool own = false);
 
-        ChatTab *addWhisperTab(std::string nick);
+        ChatTab *addWhisperTab(const std::string &nick);
 
     protected:
         friend class ChatTab;
diff --git a/src/gui/palette.cpp b/src/gui/palette.cpp
index d06d589f..5395baf5 100644
--- a/src/gui/palette.cpp
+++ b/src/gui/palette.cpp
@@ -274,7 +274,7 @@ void Palette::addColor(Palette::ColorType type, int rgb,
         mGradVector.push_back(&mColVector[type]);
 }
 
-void Palette::advanceGradient ()
+void Palette::advanceGradient()
 {
     if (get_elapsed_time(mRainbowTime) > 5)
     {
diff --git a/src/gui/sell.cpp b/src/gui/sell.cpp
index c450cd2d..f940856d 100644
--- a/src/gui/sell.cpp
+++ b/src/gui/sell.cpp
@@ -283,7 +283,8 @@ void SellDialog::logic()
 {
     Window::logic();
 
-    if (!current_npc) setVisible(false);
+    if (!current_npc)
+        setVisible(false);
 }
 
 void SellDialog::setVisible(bool visible)