Fixed a bunch of cppcheck warnings

4 files changed, 18 insertions, 21 deletions

diff --git a/src/account-server/account.h b/src/account-server/account.h
index 0ee8476..a359c11 100644
--- a/src/account-server/account.h
+++ b/src/account-server/account.h
@@ -36,6 +36,9 @@ class Account
     public:
         Account(int id = -1)
             : mID(id)
+            , mLevel(0)
+            , mRegistrationDate(0)
+            , mLastLogin(0)
         {}
 
         ~Account();
diff --git a/src/account-server/accounthandler.cpp b/src/account-server/accounthandler.cpp
index b9397fe..a9905f7 100644
--- a/src/account-server/accounthandler.cpp
+++ b/src/account-server/accounthandler.cpp
@@ -382,10 +382,9 @@ void AccountHandler::handleLoginMessage(AccountClient &client, MessageIn &msg)
 
     // Check if the account exists
     Account *acc = 0;
-    std::list<Account*>::iterator ita;
-    for ( ita = mPendingAccounts.begin() ; ita != mPendingAccounts.end(); ita++ )
-        if ((*ita)->getName() == username)
-            acc = *ita;
+    for (Account *account : mPendingAccounts)
+        if (account->getName() == username)
+            acc = account;
     mPendingAccounts.remove(acc);
 
     if (!acc || sha256(acc->getPassword() + acc->getRandomSalt()) != password)
diff --git a/src/account-server/serverhandler.cpp b/src/account-server/serverhandler.cpp
index dbf74d0..1ba3c03 100644
--- a/src/account-server/serverhandler.cpp
+++ b/src/account-server/serverhandler.cpp
@@ -213,12 +213,11 @@ void ServerHandler::processMessage(NetComputer *comp, MessageIn &msg)
                 // transmit global world state variables
                 std::map<std::string, std::string> variables;
                 variables = storage->getAllWorldStateVars(Storage::WorldMap);
-                for (std::map<std::string, std::string>::iterator i = variables.begin();
-                     i != variables.end();
-                     i++)
+
+                for (auto &variableIt : variables)
                 {
-                    outMsg.writeString(i->first);
-                    outMsg.writeString(i->second);
+                    outMsg.writeString(variableIt.first);
+                    outMsg.writeString(variableIt.second);
                 }
 
                 comp->send(outMsg);
@@ -256,12 +255,10 @@ void ServerHandler::processMessage(NetComputer *comp, MessageIn &msg)
                      // Map vars number
                     outMsg.writeInt16(variables.size());
 
-                    for (std::map<std::string, std::string>::iterator i = variables.begin();
-                         i != variables.end();
-                         i++)
+                    for (auto &variableIt : variables)
                     {
-                        outMsg.writeString(i->first);
-                        outMsg.writeString(i->second);
+                        outMsg.writeString(variableIt.first);
+                        outMsg.writeString(variableIt.second);
                     }
 
                     // Persistent Floor Items
@@ -393,14 +390,12 @@ void ServerHandler::processMessage(NetComputer *comp, MessageIn &msg)
             // save the new value to the database
             storage->setWorldStateVar(name, value, Storage::WorldMap);
             // relay the new value to all gameservers
-            for (ServerHandler::NetComputers::iterator i = clients.begin();
-                i != clients.end();
-                i++)
+            for (NetComputer *netComputer : clients)
             {
                 MessageOut varUpdateMessage(AGMSG_SET_VAR_WORLD);
                 varUpdateMessage.writeString(name);
                 varUpdateMessage.writeString(value);
-                (*i)->send(varUpdateMessage);
+                netComputer->send(varUpdateMessage);
             }
         } break;
 
diff --git a/src/account-server/storage.cpp b/src/account-server/storage.cpp
index dd8cf9a..72f4fc0 100644
--- a/src/account-server/storage.cpp
+++ b/src/account-server/storage.cpp
@@ -288,7 +288,7 @@ void Storage::fixCharactersSlot(int accountId)
             }
         }
 
-        if (slotsToUpdate.size() > 0)
+        if (!slotsToUpdate.empty())
         {
             dal::PerformTransaction transaction(mDb);
 
@@ -776,7 +776,7 @@ bool Storage::updateCharacter(CharacterData *character)
     {
         std::map<int, int>::const_iterator kill_it;
         for (kill_it = character->getKillCountBegin();
-             kill_it != character->getKillCountEnd(); kill_it++)
+             kill_it != character->getKillCountEnd(); ++kill_it)
         {
             updateKillCount(character->getDatabaseID(),
                             kill_it->first, kill_it->second);
@@ -912,7 +912,7 @@ bool Storage::updateCharacter(CharacterData *character)
     {
         std::map<int, Status>::const_iterator status_it;
         for (status_it = character->getStatusEffectBegin();
-             status_it != character->getStatusEffectEnd(); status_it++)
+             status_it != character->getStatusEffectEnd(); ++status_it)
         {
             insertStatusEffect(character->getDatabaseID(),
                                status_it->first, status_it->second.time);