*Massive cleanup redux.

--HG--
branch : trunk

9 files changed, 18 insertions, 20 deletions

diff --git a/src/shared/Database/DBCFileLoader.cpp b/src/shared/Database/DBCFileLoader.cpp
index e7ebeedecfb..744e4f1e01a 100644
--- a/src/shared/Database/DBCFileLoader.cpp
+++ b/src/shared/Database/DBCFileLoader.cpp
@@ -72,7 +72,7 @@ bool DBCFileLoader::Load(const char *filename, const char *fmt)
 
     fieldsOffset = new uint32[fieldCount];
     fieldsOffset[0] = 0;
-    for(uint32 i = 1; i < fieldCount; i++)
+    for (uint32 i = 1; i < fieldCount; i++)
     {
         fieldsOffset[i] = fieldsOffset[i - 1];
         if (fmt[i - 1] == 'b' || fmt[i - 1] == 'X')         // byte fields
@@ -109,7 +109,7 @@ uint32 DBCFileLoader::GetFormatRecordSize(const char * format,int32* index_pos)
 {
     uint32 recordsize = 0;
     int32 i = -1;
-    for(uint32 x=0; format[x];++x)
+    for (uint32 x=0; format[x]; ++x)
         switch(format[x])
         {
             case FT_FLOAT:
@@ -162,7 +162,7 @@ char* DBCFileLoader::AutoProduceData(const char* format, uint32& records, char**
     {
         uint32 maxi=0;
         //find max index
-        for(uint32 y=0;y<recordCount;y++)
+        for (uint32 y=0; y<recordCount; y++)
         {
             uint32 ind=getRecord(y).getUInt (i);
             if(ind>maxi)maxi=ind;
@@ -187,7 +187,7 @@ char* DBCFileLoader::AutoProduceData(const char* format, uint32& records, char**
 
     uint32 offset=0;
 
-    for(uint32 y =0;y<recordCount;++y)
+    for (uint32 y =0; y<recordCount; ++y)
     {
         if(i>=0)
         {
@@ -196,7 +196,7 @@ char* DBCFileLoader::AutoProduceData(const char* format, uint32& records, char**
         else
             indexTable[y]=&dataTable[offset];
 
-        for(uint32 x=0;x<fieldCount;x++)
+        for (uint32 x=0; x<fieldCount; x++)
         {
             switch(format[x])
             {
@@ -235,9 +235,9 @@ char* DBCFileLoader::AutoProduceStrings(const char* format, char* dataTable)
 
     uint32 offset=0;
 
-    for(uint32 y =0;y<recordCount;y++)
+    for (uint32 y =0; y<recordCount; y++)
     {
-        for(uint32 x=0;x<fieldCount;x++)
+        for (uint32 x=0; x<fieldCount; x++)
             switch(format[x])
         {
             case FT_FLOAT:
diff --git a/src/shared/Database/DBCStore.h b/src/shared/Database/DBCStore.h
index e02265ec523..ea4ce109e27 100644
--- a/src/shared/Database/DBCStore.h
+++ b/src/shared/Database/DBCStore.h
@@ -34,7 +34,7 @@ struct SqlDbc
     {
         // Convert dbc file name to sql table name
         sqlTableName = *_filename;
-        for (uint32 i = 0;i< sqlTableName.size();++i)
+        for (uint32 i = 0; i< sqlTableName.size(); ++i)
         {
             if (isalpha(sqlTableName[i]))
                 sqlTableName[i] = tolower(sqlTableName[i]);
@@ -46,7 +46,7 @@ struct SqlDbc
         DBCFileLoader::GetFormatRecordSize(fmt, &indexPos);
         if (indexPos>=0)
         {
-            for(uint32 x=0;x < formatString->size();x++)
+            for (uint32 x=0; x < formatString->size(); x++)
             {
                 // Count only fields present in sql
                 if ((*formatString)[x] == FT_SQL_PRESENT)
@@ -142,7 +142,7 @@ class DBCStorage
                         uint32 columnNumber = 0;
                         uint32 sqlColumnNumber = 0;
 
-                        for(;columnNumber < sql->formatString->size();++columnNumber)
+                        for (; columnNumber < sql->formatString->size(); ++columnNumber)
                         {
                             if ((*sql->formatString)[columnNumber] == FT_SQL_ABSENT)
                             {
diff --git a/src/shared/Database/Database.cpp b/src/shared/Database/Database.cpp
index 572d3db6f1d..1799cf28a65 100644
--- a/src/shared/Database/Database.cpp
+++ b/src/shared/Database/Database.cpp
@@ -232,7 +232,7 @@ bool Database::CheckRequiredField( char const* table_name, char const* required_
     {
         QueryFieldNames const& namesMap = result2->GetFieldNames();
         std::string reqName;
-        for(QueryFieldNames::const_iterator itr = namesMap.begin(); itr != namesMap.end(); ++itr)
+        for (QueryFieldNames::const_iterator itr = namesMap.begin(); itr != namesMap.end(); ++itr)
         {
             if(itr->substr(0,9)=="required_")
             {
diff --git a/src/shared/Database/QueryResult.h b/src/shared/Database/QueryResult.h
index f9f1a009833..7f213850aa6 100644
--- a/src/shared/Database/QueryResult.h
+++ b/src/shared/Database/QueryResult.h
@@ -65,7 +65,7 @@ class MANGOS_DLL_SPEC QueryNamedResult
 
         uint32 GetField_idx(const std::string &name) const
         {
-            for(size_t idx = 0; idx < mFieldNames.size(); ++idx)
+            for (size_t idx = 0; idx < mFieldNames.size(); ++idx)
             {
                 if(mFieldNames[idx] == name)
                     return idx;
diff --git a/src/shared/Database/SQLStorage.cpp b/src/shared/Database/SQLStorage.cpp
index 372baafe278..e6b3c7bfc5f 100644
--- a/src/shared/Database/SQLStorage.cpp
+++ b/src/shared/Database/SQLStorage.cpp
@@ -54,10 +54,10 @@ SQLStorage sInstanceTemplate(InstanceTemplatesrcfmt, InstanceTemplatedstfmt, "ma
 void SQLStorage::Free ()
 {
     uint32 offset=0;
-    for(uint32 x=0;x<iNumFields;x++)
+    for (uint32 x=0; x<iNumFields; x++)
         if (dst_format[x]==FT_STRING)
         {
-            for(uint32 y=0;y<MaxEntry;y++)
+            for (uint32 y=0; y<MaxEntry; y++)
                 if(pIndex[y])
                     delete [] *(char**)((char*)(pIndex[y])+offset);
 
diff --git a/src/shared/Database/SQLStorage.h b/src/shared/Database/SQLStorage.h
index cc165af532e..cfc798a8f1b 100644
--- a/src/shared/Database/SQLStorage.h
+++ b/src/shared/Database/SQLStorage.h
@@ -45,7 +45,6 @@ class SQLStorage
             init(_entry_field, sqlname);
         }
 
-
         ~SQLStorage()
         {
             Free();
diff --git a/src/shared/Database/SQLStorageImpl.h b/src/shared/Database/SQLStorageImpl.h
index b511bdad68c..5ad8a66679a 100644
--- a/src/shared/Database/SQLStorageImpl.h
+++ b/src/shared/Database/SQLStorageImpl.h
@@ -166,7 +166,7 @@ void SQLStorageLoaderBase<T>::Load(SQLStorage &store)
     uint32 sc=0;
     uint32 bo=0;
     uint32 bb=0;
-    for(uint32 x=0; x< store.iNumFields; x++)
+    for (uint32 x=0; x< store.iNumFields; x++)
         if(store.dst_format[x]==FT_STRING)
             ++sc;
         else if (store.dst_format[x]==FT_LOGIC)
@@ -189,7 +189,7 @@ void SQLStorageLoaderBase<T>::Load(SQLStorage &store)
         newIndex[fields[0].GetUInt32()]=p;
 
         offset=0;
-        for(uint32 x = 0; x < store.iNumFields; x++)
+        for (uint32 x = 0; x < store.iNumFields; x++)
             switch(store.src_format[x])
             {
                 case FT_LOGIC:
diff --git a/src/shared/Database/SqlDelayThread.h b/src/shared/Database/SqlDelayThread.h
index 3c24d3525b7..c2b826044c8 100644
--- a/src/shared/Database/SqlDelayThread.h
+++ b/src/shared/Database/SqlDelayThread.h
@@ -25,7 +25,6 @@
 #include "LockedQueue.h"
 #include "Threading.h"
 
-
 class Database;
 class SqlOperation;
 
diff --git a/src/shared/Database/SqlOperations.cpp b/src/shared/Database/SqlOperations.cpp
index 396f2e36bc2..89cebff6870 100644
--- a/src/shared/Database/SqlOperations.cpp
+++ b/src/shared/Database/SqlOperations.cpp
@@ -162,7 +162,7 @@ void SqlQueryHolder::SetResult(size_t index, QueryResult *result)
 
 SqlQueryHolder::~SqlQueryHolder()
 {
-    for(size_t i = 0; i < m_queries.size(); i++)
+    for (size_t i = 0; i < m_queries.size(); i++)
     {
         /// if the result was never used, free the resources
         /// results used already (getresult called) are expected to be deleted
@@ -189,7 +189,7 @@ void SqlQueryHolderEx::Execute(Database *db)
     /// we can do this, we are friends
     std::vector<SqlQueryHolder::SqlResultPair> &queries = m_holder->m_queries;
 
-    for(size_t i = 0; i < queries.size(); i++)
+    for (size_t i = 0; i < queries.size(); i++)
     {
         /// execute all queries in the holder and pass the results
         char const *sql = queries[i].first;