Fixed compilation again + some more code cleanup

I did some cleanup but i had a wrong path set inside qtcreator.
So i recompiled old versions and it all worked fine.
But when i recompiled from console i got a whole bunch of errors.

Sorry for pushing broken commits.

Reviewed-by: bjorn.

5 files changed, 21 insertions, 20 deletions

diff --git a/src/account-server/storage.cpp b/src/account-server/storage.cpp
index a1d1694b..370819ca 100644
--- a/src/account-server/storage.cpp
+++ b/src/account-server/storage.cpp
@@ -1481,9 +1481,9 @@ void Storage::setMemberRights(int guildId, int memberId, int rights)
     }
 }
 
-std::list<Guild*> Storage::getGuildList()
+std::map<int, Guild*> Storage::getGuildList()
 {
-    std::list<Guild*> guilds;
+    std::map<int, Guild*> guilds;
     std::stringstream sql;
     string_to<short> toShort;
 
@@ -1499,22 +1499,22 @@ std::list<Guild*> Storage::getGuildList()
             return guilds;
 
         // Loop through every row in the table and assign it to a guild
-        for ( unsigned int i = 0; i < guildInfo.rows(); ++i)
+        for (unsigned int i = 0; i < guildInfo.rows(); ++i)
         {
             Guild* guild = new Guild(guildInfo(i,1));
             guild->setId(toShort(guildInfo(i,0)));
-            guilds.push_back(guild);
+            guilds[guild->getId()] = guild;
         }
         string_to< unsigned > toUint;
 
         // Add the members to the guilds.
-        for (std::list<Guild*>::iterator itr = guilds.begin();
-             itr != guilds.end(); ++itr)
+        for (std::map<int, Guild*>::iterator it = guilds.begin();
+             it != guilds.end(); ++it)
         {
             std::ostringstream memberSql;
             memberSql << "select member_id, rights from "
                       << GUILD_MEMBERS_TBL_NAME
-                      << " where guild_id = '" << (*itr)->getId() << "';";
+                      << " where guild_id = '" << it->second->getId() << "';";
             const dal::RecordSet& memberInfo = mDb->execSql(memberSql.str());
 
             std::list<std::pair<int, int> > members;
@@ -1530,8 +1530,8 @@ std::list<Guild*> Storage::getGuildList()
                 Character *character = getCharacter((*i).first, 0);
                 if (character)
                 {
-                    character->addGuild((*itr)->getName());
-                    (*itr)->addMember(character->getDatabaseID(), (*i).second);
+                    character->addGuild(it->second->getName());
+                    it->second->addMember(character->getDatabaseID(), (*i).second);
                 }
             }
         }
diff --git a/src/account-server/storage.h b/src/account-server/storage.h
index 3c629920..81351240 100644
--- a/src/account-server/storage.h
+++ b/src/account-server/storage.h
@@ -286,7 +286,7 @@ class Storage
          *
          * @return a list of guilds
          */
-        std::list<Guild*> getGuildList();
+        std::map<int, Guild*> getGuildList();
 
         /**
          * Add a floor item to map.
diff --git a/src/chat-server/guildmanager.cpp b/src/chat-server/guildmanager.cpp
index e70134e9..51254862 100644
--- a/src/chat-server/guildmanager.cpp
+++ b/src/chat-server/guildmanager.cpp
@@ -39,7 +39,7 @@ GuildManager::~GuildManager()
     for (std::map<int, Guild*>::iterator it = mGuilds.begin();
             it != mGuilds.end(); ++it)
     {
-        delete *it;
+        delete it->second;
     }
 }
 
@@ -50,7 +50,7 @@ Guild* GuildManager::createGuild(const std::string &name, int playerId)
     storage->addGuild(guild);
 
     // Add guild, and add owner
-    mGuilds.push_back(guild);
+    mGuilds[guild->getId()] = guild;
     mOwners.push_back(playerId);
 
     // put the owner in the guild
@@ -68,7 +68,7 @@ void GuildManager::removeGuild(Guild *guild)
 {
     storage->removeGuild(guild);
     mOwners.remove(guild->getOwner());
-    mGuilds.remove(guild);
+    mGuilds.erase(guild->getId());
     delete guild;
 }
 
@@ -94,7 +94,7 @@ void GuildManager::removeGuildMember(Guild *guild, int playerId)
 Guild *GuildManager::findById(short id) const
 {
     std::map<int, Guild*>::const_iterator it = mGuilds.find(id);
-    return it == mGuilds.end() ? 0 : *it;
+    return it == mGuilds.end() ? 0 : it->second;
 }
 
 Guild *GuildManager::findByName(const std::string &name) const
@@ -103,7 +103,7 @@ Guild *GuildManager::findByName(const std::string &name) const
             it_end = mGuilds.end();
             it != it_end; ++it)
     {
-        Guild *guild = *it;
+        Guild *guild = it->second;
         if (guild->getName() == name)
             return guild;
     }
@@ -119,12 +119,12 @@ std::vector<Guild*> GuildManager::getGuildsForPlayer(int playerId) const
 {
     std::vector<Guild*> guildList;
 
-    for (std::list<Guild*>::const_iterator it = mGuilds.begin();
-            it != mGuilds.end(); ++it)
+    for (std::map<int, Guild*>::const_iterator it = mGuilds.begin();
+         it != mGuilds.end(); ++it)
     {
-        if ((*it)->checkInGuild(playerId))
+        if (it->second->checkInGuild(playerId))
         {
-            guildList.push_back(*it);
+            guildList.push_back(it->second);
         }
     }
     return guildList;
diff --git a/src/chat-server/guildmanager.h b/src/chat-server/guildmanager.h
index 565504ef..43085746 100644
--- a/src/chat-server/guildmanager.h
+++ b/src/chat-server/guildmanager.h
@@ -24,6 +24,7 @@
 #include <list>
 #include <string>
 #include <vector>
+#include <map>
 
 class Guild;
 class ChatClient;
diff --git a/src/game-server/state.cpp b/src/game-server/state.cpp
index 01471378..930c475b 100644
--- a/src/game-server/state.cpp
+++ b/src/game-server/state.cpp
@@ -90,7 +90,7 @@ static void updateMap(MapComposite *map)
     }
 
     // 3. perform actions.
-    for (BeingIterator i(map->getWholeMapIterator()); it; ++it)
+    for (BeingIterator it(map->getWholeMapIterator()); it; ++it)
     {
         (*it)->perform();
     }