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

6 files changed, 8 insertions, 14 deletions

diff --git a/src/net/manaserv/charhandler.cpp b/src/net/manaserv/charhandler.cpp
index 3b2306feb..42db6e621 100644
--- a/src/net/manaserv/charhandler.cpp
+++ b/src/net/manaserv/charhandler.cpp
@@ -138,7 +138,7 @@ void CharHandler::handleCharacterCreateResponse(Net::MessageIn &msg)
     if (errMsg != ERRMSG_OK)
     {
         // Character creation failed
-        std::string errorMessage = "";
+        std::string errorMessage("");
         switch (errMsg)
         {
             case ERRMSG_NO_LOGIN:
@@ -212,7 +212,7 @@ void CharHandler::handleCharacterDeleteResponse(Net::MessageIn &msg)
     else
     {
         // Character deletion failed
-        std::string errorMessage = "";
+        std::string errorMessage("");
         switch (errMsg)
         {
             case ERRMSG_NO_LOGIN:
diff --git a/src/net/manaserv/chathandler.cpp b/src/net/manaserv/chathandler.cpp
index 85323b11a..16552018e 100644
--- a/src/net/manaserv/chathandler.cpp
+++ b/src/net/manaserv/chathandler.cpp
@@ -231,7 +231,7 @@ void ChatHandler::handlePrivateMessage(Net::MessageIn &msg)
     std::string userNick = msg.readString();
     std::string chatMsg = msg.readString();
 
-    chatWindow->whisper(userNick, chatMsg);
+    chatWindow->addWhisper(userNick, chatMsg);
 }
 
 void ChatHandler::handleAnnouncement(Net::MessageIn &msg)
diff --git a/src/net/manaserv/generalhandler.cpp b/src/net/manaserv/generalhandler.cpp
index 7c95033a8..2eea6cdf6 100644
--- a/src/net/manaserv/generalhandler.cpp
+++ b/src/net/manaserv/generalhandler.cpp
@@ -64,7 +64,7 @@ namespace ManaServ
 Connection *accountServerConnection = 0;
 Connection *chatServerConnection = 0;
 Connection *gameServerConnection = 0;
-std::string netToken = "";
+std::string netToken("");
 ServerInfo gameServer;
 ServerInfo chatServer;
 
@@ -176,8 +176,8 @@ void GeneralHandler::clearHandlers()
     clearNetworkHandlers();
 }
 
-void GeneralHandler::event(Mana::Channels channel,
-                           const Mana::Event &event)
+void GeneralHandler::processEvent(Mana::Channels channel,
+                                  const Mana::Event &event)
 {
     if (channel == Mana::CHANNEL_CLIENT)
     {
diff --git a/src/net/manaserv/generalhandler.h b/src/net/manaserv/generalhandler.h
index 90587eeb3..ccdddbbe6 100644
--- a/src/net/manaserv/generalhandler.h
+++ b/src/net/manaserv/generalhandler.h
@@ -56,7 +56,7 @@ class GeneralHandler : public Net::GeneralHandler, public Mana::Listener
 
         void clearHandlers();
 
-        void event(Mana::Channels channel, const Mana::Event &event);
+        void processEvent(Mana::Channels channel, const Mana::Event &event);
 
     protected:
         MessageHandlerPtr mBeingHandler;
diff --git a/src/net/manaserv/network.cpp b/src/net/manaserv/network.cpp
index 53e83e4ec..b83bc5748 100644
--- a/src/net/manaserv/network.cpp
+++ b/src/net/manaserv/network.cpp
@@ -45,7 +45,7 @@ namespace ManaServ
 {
 
 typedef std::map<unsigned short, MessageHandler*> MessageHandlers;
-typedef MessageHandlers::iterator MessageHandlerIterator;
+typedef MessageHandlers::const_iterator MessageHandlerIterator;
 static MessageHandlers mMessageHandlers;
 
 void initialize()
@@ -96,17 +96,13 @@ Connection *getConnection()
 void registerHandler(MessageHandler *handler)
 {
     for (const Uint16 *i = handler->handledMessages; *i; i++)
-    {
         mMessageHandlers[*i] = handler;
-    }
 }
 
 void unregisterHandler(MessageHandler *handler)
 {
     for (const Uint16 *i = handler->handledMessages; *i; i++)
-    {
         mMessageHandlers.erase(*i);
-    }
 }
 
 void clearNetworkHandlers()
diff --git a/src/net/manaserv/npchandler.cpp b/src/net/manaserv/npchandler.cpp
index efd2ab2bc..8ff2c5d21 100644
--- a/src/net/manaserv/npchandler.cpp
+++ b/src/net/manaserv/npchandler.cpp
@@ -60,9 +60,7 @@ void NpcHandler::handleMessage(Net::MessageIn &msg)
 {
     Being *being = actorSpriteManager->findBeing(msg.readInt16());
     if (!being || being->getType() != ActorSprite::NPC)
-    {
         return;
-    }
 
     int npcId = being->getId();
     NpcDialogs::iterator diag = mNpcDialogs.find(npcId);