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, 11 insertions, 11 deletions

diff --git a/src/gui/socialwindow.cpp b/src/gui/socialwindow.cpp
index 749f26f85..a8d15f36c 100644
--- a/src/gui/socialwindow.cpp
+++ b/src/gui/socialwindow.cpp
@@ -232,7 +232,7 @@ public:
         mScroll = 0;
     }
 
-    void action(const gcn::ActionEvent &event)
+    void action(const gcn::ActionEvent &event A_UNUSED)
     {
 /*
         if (event.getId() == "do invite")
@@ -528,7 +528,7 @@ public:
             return 0;
 
         Avatar *ava = 0;
-        std::vector<Avatar*>::iterator i = avatars->begin();
+        std::vector<Avatar*>::const_iterator i = avatars->begin();
         while (i != avatars->end())
         {
             ava = (*i);
@@ -562,7 +562,7 @@ public:
                 if (!ava)
                     break;
 
-                std::vector<std::string>::iterator i = names.begin();
+                std::vector<std::string>::const_iterator i = names.begin();
                 while (i != names.end())
                 {
                     if (ava->getName() == (*i) && (*i) != "")
@@ -584,7 +584,7 @@ public:
                 }
             }
 
-            std::vector<std::string>::iterator i = names.begin();
+            std::vector<std::string>::const_iterator i = names.begin();
 
             while (i != names.end())
             {
@@ -659,7 +659,7 @@ public:
         std::vector<Avatar*> *avatars = mBeings->getMembers();
         std::vector<MapItem*> portals = map->getPortals();
 
-        std::vector<MapItem*>::iterator i = portals.begin();
+        std::vector<MapItem*>::const_iterator i = portals.begin();
         SpecialLayer *specialLayer = map->getSpecialLayer();
 
         std::vector<Avatar*>::iterator ia = avatars->begin();
@@ -752,7 +752,7 @@ public:
             return;
 
         Avatar *ava = 0;
-        std::vector<Avatar*>::iterator i = avatars->begin();
+        std::vector<Avatar*>::const_iterator i = avatars->begin();
         while (i != avatars->end())
         {
             ava = (*i);
@@ -786,7 +786,7 @@ public:
             return 01;
 
         Avatar *ava = 0;
-        std::vector<Avatar*>::iterator i = avatars->begin();
+        std::vector<Avatar*>::const_iterator i = avatars->begin();
         unsigned num = 0;
         while (i != avatars->end())
         {
@@ -962,7 +962,7 @@ public:
             {
                 name = *i;
             }
-            Avatar *ava = new Avatar(name);
+            ava = new Avatar(name);
             ava->setOnline(true);
             ava->setLevel(level);
             ava->setType(MapItem::PRIORITY);
@@ -997,7 +997,7 @@ public:
             {
                 name = *i;
             }
-            Avatar *ava = new Avatar(name);
+            ava = new Avatar(name);
             ava->setOnline(true);
             ava->setLevel(level);
             ava->setType(MapItem::ATTACK);
@@ -1032,7 +1032,7 @@ public:
             {
                 name = *i;
             }
-            Avatar *ava = new Avatar(name);
+            ava = new Avatar(name);
             ava->setOnline(false);
             ava->setLevel(level);
             ava->setType(MapItem::IGNORE_);
@@ -1114,7 +1114,7 @@ private:
 };
 
 SocialWindow::SocialWindow() :
-    Window(_("Social")),
+    Window(_("Social"), false, 0, "social.xml"),
     mGuildInvited(0),
     mGuildAcceptDialog(0),
     mPartyAcceptDialog(0),