Fix more gcc 4.7 warnings.

1 files changed, 37 insertions, 37 deletions

diff --git a/src/gui/socialwindow.cpp b/src/gui/socialwindow.cpp
index 6b07e109f..2bc8aba9b 100644
--- a/src/gui/socialwindow.cpp
+++ b/src/gui/socialwindow.cpp
@@ -66,10 +66,10 @@ protected:
     friend class SocialWindow;
 
     SocialTab():
-            mInviteDialog(0),
-            mConfirmDialog(0),
-            mScroll(0),
-            mList(0)
+            mInviteDialog(nullptr),
+            mConfirmDialog(nullptr),
+            mScroll(nullptr),
+            mList(nullptr)
     {}
 
     virtual ~SocialTab()
@@ -129,9 +129,9 @@ public:
     ~SocialGuildTab()
     {
         delete mList;
-        mList = 0;
+        mList = nullptr;
         delete mScroll;
-        mScroll = 0;
+        mScroll = nullptr;
     }
 
     void action(const gcn::ActionEvent &event)
@@ -147,11 +147,11 @@ public:
                     _("Invited user %s to guild %s."),
                     name.c_str(), mGuild->getName().c_str()), BY_SERVER);
             }
-            mInviteDialog = 0;
+            mInviteDialog = nullptr;
         }
         else if (event.getId() == "~do invite")
         {
-            mInviteDialog = 0;
+            mInviteDialog = nullptr;
         }
         else if (event.getId() == "yes")
         {
@@ -161,11 +161,11 @@ public:
                 localChatTab->chatLog(strprintf(_("Guild %s quit requested."),
                                       mGuild->getName().c_str()), BY_SERVER);
             }
-            mConfirmDialog = 0;
+            mConfirmDialog = nullptr;
         }
         else if (event.getId() == "~yes")
         {
-            mConfirmDialog = 0;
+            mConfirmDialog = nullptr;
         }
     }
 
@@ -227,9 +227,9 @@ public:
     ~SocialGuildTab2()
     {
         delete mList;
-        mList = 0;
+        mList = nullptr;
         delete mScroll;
-        mScroll = 0;
+        mScroll = nullptr;
     }
 
     void action(const gcn::ActionEvent &event A_UNUSED)
@@ -330,9 +330,9 @@ public:
     ~SocialPartyTab()
     {
         delete mList;
-        mList = 0;
+        mList = nullptr;
         delete mScroll;
-        mScroll = 0;
+        mScroll = nullptr;
     }
 
     void action(const gcn::ActionEvent &event)
@@ -465,11 +465,11 @@ public:
     ~SocialPlayersTab()
     {
         delete mList;
-        mList = 0;
+        mList = nullptr;
         delete mScroll;
-        mScroll = 0;
+        mScroll = nullptr;
         delete mBeings;
-        mBeings = 0;
+        mBeings = nullptr;
     }
 
     void updateList()
@@ -525,9 +525,9 @@ public:
     {
         std::vector<Avatar*> *avatars = mBeings->getMembers();
         if (!avatars)
-            return 0;
+            return nullptr;
 
-        Avatar *ava = 0;
+        Avatar *ava = nullptr;
         std::vector<Avatar*>::const_iterator i = avatars->begin();
         while (i != avatars->end())
         {
@@ -629,11 +629,11 @@ public:
     ~SocialNavigationTab()
     {
         delete mList;
-        mList = 0;
+        mList = nullptr;
         delete mScroll;
-        mScroll = 0;
+        mScroll = nullptr;
         delete mBeings;
-        mBeings = 0;
+        mBeings = nullptr;
     }
 
     void invite()
@@ -751,7 +751,7 @@ public:
         if (!map)
             return;
 
-        Avatar *ava = 0;
+        Avatar *ava = nullptr;
         std::vector<Avatar*>::const_iterator i = avatars->begin();
         while (i != avatars->end())
         {
@@ -785,7 +785,7 @@ public:
         if (!map)
             return 01;
 
-        Avatar *ava = 0;
+        Avatar *ava = nullptr;
         std::vector<Avatar*>::const_iterator i = avatars->begin();
         unsigned num = 0;
         while (i != avatars->end())
@@ -906,11 +906,11 @@ public:
     ~SocialAttackTab()
     {
         delete mList;
-        mList = 0;
+        mList = nullptr;
         delete mScroll;
-        mScroll = 0;
+        mScroll = nullptr;
         delete mBeings;
-        mBeings = 0;
+        mBeings = nullptr;
     }
 
     void invite()
@@ -1114,11 +1114,11 @@ private:
 };
 
 SocialWindow::SocialWindow() :
-    Window(_("Social"), false, 0, "social.xml"),
+    Window(_("Social"), false, nullptr, "social.xml"),
     mGuildInvited(0),
-    mGuildAcceptDialog(0),
-    mPartyAcceptDialog(0),
-    mMap(0),
+    mGuildAcceptDialog(nullptr),
+    mPartyAcceptDialog(nullptr),
+    mMap(nullptr),
     mLastUpdateTime(0),
     mNeedUpdate(false),
     mProcessedPortals(false)
@@ -1165,7 +1165,7 @@ SocialWindow::SocialWindow() :
     }
     else
     {
-        mAttackFilter = 0;
+        mAttackFilter = nullptr;
     }
 
     if (player_node && player_node->getParty())
@@ -1198,13 +1198,13 @@ SocialWindow::~SocialWindow()
         mPartyInviter = "";
     }
     delete mCreatePopup;
-    mCreatePopup = 0;
+    mCreatePopup = nullptr;
     delete mPlayers;
-    mPlayers = 0;
+    mPlayers = nullptr;
     delete mNavigation;
-    mNavigation = 0;
+    mNavigation = nullptr;
     delete mAttackFilter;
-    mAttackFilter = 0;
+    mAttackFilter = nullptr;
 }
 
 bool SocialWindow::addTab(Guild *guild)
@@ -1212,7 +1212,7 @@ bool SocialWindow::addTab(Guild *guild)
     if (mGuilds.find(guild) != mGuilds.end())
         return false;
 
-    SocialTab *tab = 0;
+    SocialTab *tab = nullptr;
     if (guild->getServerGuild())
         tab = new SocialGuildTab(guild);
     else