Merge branch 'master' into strippedstripped1.1.9.18

Conflicts:
	src/guichan/cliprectangle.cpp
	src/guichan/focushandler.cpp
	src/guichan/gui.cpp
	src/guichan/include/guichan/cliprectangle.hpp
	src/guichan/include/guichan/inputevent.hpp
	src/guichan/include/guichan/keyevent.hpp
	src/guichan/include/guichan/mouseevent.hpp
	src/guichan/include/guichan/widgets/button.hpp
	src/guichan/include/guichan/widgets/checkbox.hpp
	src/guichan/include/guichan/widgets/dropdown.hpp
	src/guichan/include/guichan/widgets/radiobutton.hpp
	src/guichan/include/guichan/widgets/slider.hpp
	src/guichan/include/guichan/widgets/tab.hpp
	src/guichan/include/guichan/widgets/tabbedarea.hpp
	src/guichan/include/guichan/widgets/textfield.hpp
	src/guichan/include/guichan/widgets/window.hpp
	src/guichan/inputevent.cpp
	src/guichan/keyevent.cpp
	src/guichan/mouseevent.cpp
	src/guichan/widget.cpp
	src/guichan/widgets/button.cpp
	src/guichan/widgets/checkbox.cpp
	src/guichan/widgets/dropdown.cpp
	src/guichan/widgets/radiobutton.cpp
	src/guichan/widgets/slider.cpp
	src/guichan/widgets/tab.cpp
	src/guichan/widgets/tabbedarea.cpp
	src/guichan/widgets/textfield.cpp
	src/guichan/widgets/window.cpp

1 files changed, 7 insertions, 9 deletions

diff --git a/src/net/messagein.cpp b/src/net/messagein.cpp
index 5bfeefdb6..8f177f906 100644
--- a/src/net/messagein.cpp
+++ b/src/net/messagein.cpp
@@ -190,12 +190,11 @@ std::string MessageIn::readString(int length)
     char const *stringEnd
         = static_cast<char const *>(memchr(stringBeg, '\0', length));
 
-    std::string readString(stringBeg,
-                           stringEnd ? stringEnd - stringBeg : length);
+    std::string str(stringBeg, stringEnd ? stringEnd - stringBeg : length);
     mPos += length;
     PacketCounters::incInBytes(length);
-    DEBUGLOG("readString: " + readString);
-    return readString;
+    DEBUGLOG("readString: " + str);
+    return str;
 }
 
 std::string MessageIn::readRawString(int length)
@@ -215,12 +214,11 @@ std::string MessageIn::readRawString(int length)
     char const *stringBeg = mData + mPos;
     char const *stringEnd
         = static_cast<char const *>(memchr(stringBeg, '\0', length));
-    std::string readString(stringBeg,
-                           stringEnd ? stringEnd - stringBeg : length);
+    std::string str(stringBeg, stringEnd ? stringEnd - stringBeg : length);
 
     mPos += length;
     PacketCounters::incInBytes(length);
-    DEBUGLOG("readString: " + readString);
+    DEBUGLOG("readString: " + str);
 
     if (stringEnd)
     {
@@ -234,11 +232,11 @@ std::string MessageIn::readRawString(int length)
         {
             DEBUGLOG("readString2: " + hiddenPart);
 
-            return readString + "|" + hiddenPart;
+            return str + "|" + hiddenPart;
         }
     }
 
-    return readString;
+    return str;
 }
 
 }