Apply C++11 fixits

modernize-use-auto
modernize-use-nullptr
modernize-use-override
modernize-use-using

1 files changed, 7 insertions, 8 deletions

diff --git a/src/chat-server/guild.cpp b/src/chat-server/guild.cpp
index e86130dc..b87860ae 100644
--- a/src/chat-server/guild.cpp
+++ b/src/chat-server/guild.cpp
@@ -39,7 +39,7 @@ Guild::~Guild()
 void Guild::addMember(int playerId, int permissions)
 {
     // create new guild member
-    GuildMember *member = new GuildMember;
+    auto member = new GuildMember;
     member->mId = playerId;
     member->mPermissions = permissions;
 
@@ -54,7 +54,7 @@ void Guild::removeMember(int playerId)
     if (getOwner() == playerId)
     {
         // if the leader is leaving, assign next member as leader
-        for (std::list<GuildMember*>::iterator it = mMembers.begin(),
+        for (auto it = mMembers.begin(),
              it_end = mMembers.end(); it != it_end; ++it)
         {
             GuildMember *member = *it;
@@ -72,8 +72,8 @@ void Guild::removeMember(int playerId)
 
 int Guild::getOwner() const
 {
-    std::list<GuildMember*>::const_iterator itr = mMembers.begin();
-    std::list<GuildMember*>::const_iterator itr_end = mMembers.end();
+    auto itr = mMembers.begin();
+    auto itr_end = mMembers.end();
 
     while (itr != itr_end)
     {
@@ -107,13 +107,12 @@ void Guild::removeInvited(int playerId)
 
 bool Guild::checkInGuild(int playerId) const
 {
-    return getMember(playerId) != 0;
+    return getMember(playerId) != nullptr;
 }
 
 GuildMember *Guild::getMember(int playerId) const
 {
-    std::list<GuildMember*>::const_iterator itr = mMembers.begin(),
-                                            itr_end = mMembers.end();
+    auto itr = mMembers.begin(), itr_end = mMembers.end();
     while (itr != itr_end)
     {
         if ((*itr)->mId == playerId)
@@ -121,7 +120,7 @@ GuildMember *Guild::getMember(int playerId) const
         ++itr;
     }
 
-    return 0;
+    return nullptr;
 }
 
 bool Guild::canInvite(int playerId) const