*Merge.

--HG--
branch : trunk

35 files changed, 35 insertions, 0 deletions

diff --git a/src/shared/Database/DBCEnums.h b/src/shared/Database/DBCEnums.h
index 1d54616a2b5..d8699b2c240 100644
--- a/src/shared/Database/DBCEnums.h
+++ b/src/shared/Database/DBCEnums.h
@@ -110,3 +110,4 @@ enum TotemCategoryType
 };
 
 #endif
+
diff --git a/src/shared/Database/DBCStores.cpp b/src/shared/Database/DBCStores.cpp
index fb132c75768..67b806cd632 100644
--- a/src/shared/Database/DBCStores.cpp
+++ b/src/shared/Database/DBCStores.cpp
@@ -649,3 +649,4 @@ uint32 const* GetTalentTabPages(uint32 cls)
 TRINITY_DLL_SPEC DBCStorage <SoundEntriesEntry>  const* GetSoundEntriesStore()   { return &sSoundEntriesStore;   }
 TRINITY_DLL_SPEC DBCStorage <SpellEntry>         const* GetSpellStore()          { return &sSpellStore;          }
 TRINITY_DLL_SPEC DBCStorage <SpellRangeEntry>    const* GetSpellRangeStore()     { return &sSpellRangeStore;     }
+
diff --git a/src/shared/Database/DBCStores.h b/src/shared/Database/DBCStores.h
index 98a54fbeccf..dd255894ded 100644
--- a/src/shared/Database/DBCStores.h
+++ b/src/shared/Database/DBCStores.h
@@ -204,3 +204,4 @@ TRINITY_DLL_SPEC DBCStorage <SoundEntriesEntry>  const* GetSoundEntriesStore();
 TRINITY_DLL_SPEC DBCStorage <SpellEntry>         const* GetSpellStore();
 TRINITY_DLL_SPEC DBCStorage <SpellRangeEntry>    const* GetSpellRangeStore();
 #endif
+
diff --git a/src/shared/Database/DBCStructure.h b/src/shared/Database/DBCStructure.h
index f2dc8222a72..2f51f1d6579 100644
--- a/src/shared/Database/DBCStructure.h
+++ b/src/shared/Database/DBCStructure.h
@@ -891,3 +891,4 @@ typedef std::vector<TaxiPathNodeList> TaxiPathNodesByPath;
 #define TaxiMaskSize 16
 typedef uint32 TaxiMask[TaxiMaskSize];
 #endif
+
diff --git a/src/shared/Database/DBCfmt.cpp b/src/shared/Database/DBCfmt.cpp
index 57a81921d62..cab781692f0 100644
--- a/src/shared/Database/DBCfmt.cpp
+++ b/src/shared/Database/DBCfmt.cpp
@@ -82,3 +82,4 @@ const char TaxiPathNodeEntryfmt[]="diiifffiixx";
 const char TotemCategoryEntryfmt[]="nxxxxxxxxxxxxxxxxxii";
 const char WorldMapAreaEntryfmt[]="xinxffffi";
 const char WorldSafeLocsEntryfmt[]="nifffxxxxxxxxxxxxxxxxx";
+
diff --git a/src/shared/Database/Database.cpp b/src/shared/Database/Database.cpp
index 4623deacbed..7110fe44c54 100644
--- a/src/shared/Database/Database.cpp
+++ b/src/shared/Database/Database.cpp
@@ -171,3 +171,4 @@ bool Database::DirectPExecute(const char * format,...)
 
     return DirectExecute(szQuery);
 }
+
diff --git a/src/shared/Database/Database.h b/src/shared/Database/Database.h
index 7e64fbebb55..c2ee9349979 100644
--- a/src/shared/Database/Database.h
+++ b/src/shared/Database/Database.h
@@ -135,3 +135,4 @@ class TRINITY_DLL_SPEC Database
         std::string m_logsDir;
 };
 #endif
+
diff --git a/src/shared/Database/DatabaseEnv.h b/src/shared/Database/DatabaseEnv.h
index fe565cde7a6..664459473af 100644
--- a/src/shared/Database/DatabaseEnv.h
+++ b/src/shared/Database/DatabaseEnv.h
@@ -56,3 +56,4 @@ extern DatabaseType CharacterDatabase;
 extern DatabaseType LoginDatabase;
 
 #endif
+
diff --git a/src/shared/Database/DatabaseImpl.h b/src/shared/Database/DatabaseImpl.h
index 244f52d0106..5ab4ec04a65 100644
--- a/src/shared/Database/DatabaseImpl.h
+++ b/src/shared/Database/DatabaseImpl.h
@@ -205,3 +205,4 @@ Database::DelayQueryHolder(Class *object, void (Class::*method)(QueryResult*, Sq
 #undef ASYNC_QUERY_BODY
 #undef ASYNC_PQUERY_BODY
 #undef ASYNC_DELAYHOLDER_BODY
+
diff --git a/src/shared/Database/DatabaseMysql.cpp b/src/shared/Database/DatabaseMysql.cpp
index 0fae83caadf..72da1090a85 100644
--- a/src/shared/Database/DatabaseMysql.cpp
+++ b/src/shared/Database/DatabaseMysql.cpp
@@ -408,3 +408,4 @@ void DatabaseMysql::HaltDelayThread()
     m_threadBody = NULL;
 }
 #endif
+
diff --git a/src/shared/Database/DatabaseMysql.h b/src/shared/Database/DatabaseMysql.h
index ee800fdf22e..1826a08f2aa 100644
--- a/src/shared/Database/DatabaseMysql.h
+++ b/src/shared/Database/DatabaseMysql.h
@@ -77,3 +77,4 @@ class TRINITY_DLL_SPEC DatabaseMysql : public Database
 };
 #endif
 #endif
+
diff --git a/src/shared/Database/DatabasePostgre.cpp b/src/shared/Database/DatabasePostgre.cpp
index 6a172bb12a0..25b5a58b863 100644
--- a/src/shared/Database/DatabasePostgre.cpp
+++ b/src/shared/Database/DatabasePostgre.cpp
@@ -345,3 +345,4 @@ void DatabasePostgre::HaltDelayThread()
     m_threadBody = NULL;
 }
 #endif
+
diff --git a/src/shared/Database/DatabasePostgre.h b/src/shared/Database/DatabasePostgre.h
index 7e541f84c73..6dc0c509869 100644
--- a/src/shared/Database/DatabasePostgre.h
+++ b/src/shared/Database/DatabasePostgre.h
@@ -75,3 +75,4 @@ class DatabasePostgre : public Database
         bool _TransactionCmd(const char *sql);
 };
 #endif
+
diff --git a/src/shared/Database/DatabaseSqlite.cpp b/src/shared/Database/DatabaseSqlite.cpp
index 9de786bf739..a7a4a2a9847 100644
--- a/src/shared/Database/DatabaseSqlite.cpp
+++ b/src/shared/Database/DatabaseSqlite.cpp
@@ -101,3 +101,4 @@ bool DatabaseSqlite::Execute(const char *sql)
     return true;
 }
 #endif
+
diff --git a/src/shared/Database/DatabaseSqlite.h b/src/shared/Database/DatabaseSqlite.h
index 325c3168acb..32d49d0124b 100644
--- a/src/shared/Database/DatabaseSqlite.h
+++ b/src/shared/Database/DatabaseSqlite.h
@@ -43,3 +43,4 @@ class DatabaseSqlite : public Database
 };
 #endif
 #endif
+
diff --git a/src/shared/Database/Field.cpp b/src/shared/Database/Field.cpp
index 20a88395b7e..a7817d9a630 100644
--- a/src/shared/Database/Field.cpp
+++ b/src/shared/Database/Field.cpp
@@ -65,3 +65,4 @@ void Field::SetValue(const char *value)
     else
         mValue = NULL;
 }
+
diff --git a/src/shared/Database/Field.h b/src/shared/Database/Field.h
index 430e262c39e..3e5f26376bb 100644
--- a/src/shared/Database/Field.h
+++ b/src/shared/Database/Field.h
@@ -75,3 +75,4 @@ class Field
         enum DataTypes mType;
 };
 #endif
+
diff --git a/src/shared/Database/MySQLDelayThread.h b/src/shared/Database/MySQLDelayThread.h
index b01d88b6f72..14cf1a64617 100644
--- a/src/shared/Database/MySQLDelayThread.h
+++ b/src/shared/Database/MySQLDelayThread.h
@@ -30,3 +30,4 @@ class MySQLDelayThread : public SqlDelayThread
         void Stop() { SqlDelayThread::Stop(); }
 };
 #endif                                                      //__MYSQLDELAYTHREAD_H
+
diff --git a/src/shared/Database/PGSQLDelayThread.h b/src/shared/Database/PGSQLDelayThread.h
index 0525fb9f6d6..19941464cca 100644
--- a/src/shared/Database/PGSQLDelayThread.h
+++ b/src/shared/Database/PGSQLDelayThread.h
@@ -30,3 +30,4 @@ class PGSQLDelayThread : public SqlDelayThread
         void Stop() { SqlDelayThread::Stop(); }
 };
 #endif                                                      //__PGSQLDELAYTHREAD_H
+
diff --git a/src/shared/Database/QueryResult.h b/src/shared/Database/QueryResult.h
index ab87fda59be..32e47c0959f 100644
--- a/src/shared/Database/QueryResult.h
+++ b/src/shared/Database/QueryResult.h
@@ -64,3 +64,4 @@ class TRINITY_DLL_SPEC QueryResult
         FieldNames mFieldNames;
 };
 #endif
+
diff --git a/src/shared/Database/QueryResultMysql.cpp b/src/shared/Database/QueryResultMysql.cpp
index 63808060b9f..d995b9f2473 100644
--- a/src/shared/Database/QueryResultMysql.cpp
+++ b/src/shared/Database/QueryResultMysql.cpp
@@ -110,3 +110,4 @@ enum Field::DataTypes QueryResultMysql::ConvertNativeType(enum_field_types mysql
     }
 }
 #endif
+
diff --git a/src/shared/Database/QueryResultMysql.h b/src/shared/Database/QueryResultMysql.h
index 79f5439ed06..3131bd4bbe4 100644
--- a/src/shared/Database/QueryResultMysql.h
+++ b/src/shared/Database/QueryResultMysql.h
@@ -48,3 +48,4 @@ class QueryResultMysql : public QueryResult
 };
 #endif
 #endif
+
diff --git a/src/shared/Database/QueryResultPostgre.cpp b/src/shared/Database/QueryResultPostgre.cpp
index 8ebe03ede64..def1b0061e5 100644
--- a/src/shared/Database/QueryResultPostgre.cpp
+++ b/src/shared/Database/QueryResultPostgre.cpp
@@ -139,3 +139,4 @@ enum Field::DataTypes QueryResultPostgre::ConvertNativeType(Oid  pOid ) const
     return Field::DB_TYPE_UNKNOWN;
 }
 #endif
+
diff --git a/src/shared/Database/QueryResultPostgre.h b/src/shared/Database/QueryResultPostgre.h
index ac7f31223ba..61311728f2d 100644
--- a/src/shared/Database/QueryResultPostgre.h
+++ b/src/shared/Database/QueryResultPostgre.h
@@ -48,3 +48,4 @@ class QueryResultPostgre : public QueryResult
         uint32 mTableIndex;
 };
 #endif
+
diff --git a/src/shared/Database/QueryResultSqlite.cpp b/src/shared/Database/QueryResultSqlite.cpp
index 2bf64ed49ab..a041232f600 100644
--- a/src/shared/Database/QueryResultSqlite.cpp
+++ b/src/shared/Database/QueryResultSqlite.cpp
@@ -96,3 +96,4 @@ enum Field::DataTypes QueryResultSqlite::ConvertNativeType(const char* sqliteTyp
     return Field::DB_TYPE_UNKNOWN;
 }
 #endif
+
diff --git a/src/shared/Database/QueryResultSqlite.h b/src/shared/Database/QueryResultSqlite.h
index 1416ac426cc..b2622f96707 100644
--- a/src/shared/Database/QueryResultSqlite.h
+++ b/src/shared/Database/QueryResultSqlite.h
@@ -43,3 +43,4 @@ class QueryResultSqlite : public QueryResult
 };
 #endif
 #endif
+
diff --git a/src/shared/Database/SQLStorage.cpp b/src/shared/Database/SQLStorage.cpp
index cd1c7908e46..1419d6a2ac6 100644
--- a/src/shared/Database/SQLStorage.cpp
+++ b/src/shared/Database/SQLStorage.cpp
@@ -81,3 +81,4 @@ void SQLStorage::Load()
     SQLStorageLoader loader;
     loader.Load(*this);
 }
+
diff --git a/src/shared/Database/SQLStorage.h b/src/shared/Database/SQLStorage.h
index 5a429d185cb..43e34532607 100644
--- a/src/shared/Database/SQLStorage.h
+++ b/src/shared/Database/SQLStorage.h
@@ -114,3 +114,4 @@ struct SQLStorageLoader : public SQLStorageLoaderBase<SQLStorageLoader>
 };
 
 #endif
+
diff --git a/src/shared/Database/SQLStorageImpl.h b/src/shared/Database/SQLStorageImpl.h
index 4f10c6eee05..82ff0beb60e 100644
--- a/src/shared/Database/SQLStorageImpl.h
+++ b/src/shared/Database/SQLStorageImpl.h
@@ -212,3 +212,4 @@ void SQLStorageLoaderBase<T>::Load(SQLStorage &store)
     store.MaxEntry = maxi;
     store.data = _data;
 }
+
diff --git a/src/shared/Database/SqlDelayThread.cpp b/src/shared/Database/SqlDelayThread.cpp
index a265b48e622..16d5146fc53 100644
--- a/src/shared/Database/SqlDelayThread.cpp
+++ b/src/shared/Database/SqlDelayThread.cpp
@@ -55,3 +55,4 @@ void SqlDelayThread::Stop()
 {
     m_running = false;
 }
+
diff --git a/src/shared/Database/SqlDelayThread.h b/src/shared/Database/SqlDelayThread.h
index 093c1c843d0..4c77c122f1e 100644
--- a/src/shared/Database/SqlDelayThread.h
+++ b/src/shared/Database/SqlDelayThread.h
@@ -48,3 +48,4 @@ class SqlDelayThread : public ZThread::Runnable
         virtual void run();                                 ///< Main Thread loop
 };
 #endif                                                      //__SQLDELAYTHREAD_H
+
diff --git a/src/shared/Database/SqlOperations.cpp b/src/shared/Database/SqlOperations.cpp
index 1a81c4c96a1..c11c5b9269d 100644
--- a/src/shared/Database/SqlOperations.cpp
+++ b/src/shared/Database/SqlOperations.cpp
@@ -199,3 +199,4 @@ void SqlQueryHolderEx::Execute(Database *db)
     /// sync with the caller thread
     m_queue->add(m_callback);
 }
+
diff --git a/src/shared/Database/SqlOperations.h b/src/shared/Database/SqlOperations.h
index 0ebff9868d9..1a0d3c78d1b 100644
--- a/src/shared/Database/SqlOperations.h
+++ b/src/shared/Database/SqlOperations.h
@@ -121,3 +121,4 @@ class SqlQueryHolderEx : public SqlOperation
         void Execute(Database *db);
 };
 #endif                                                      //__SQLOPERATIONS_H
+
diff --git a/src/shared/Database/dbcfile.cpp b/src/shared/Database/dbcfile.cpp
index 9f570e72496..9b363dbff8d 100644
--- a/src/shared/Database/dbcfile.cpp
+++ b/src/shared/Database/dbcfile.cpp
@@ -243,3 +243,4 @@ char* DBCFile::AutoProduceStrings(const char* format, char* dataTable)
 
     return stringPool;
 }
+
diff --git a/src/shared/Database/dbcfile.h b/src/shared/Database/dbcfile.h
index e0cef4dee5f..aa36f6003dc 100644
--- a/src/shared/Database/dbcfile.h
+++ b/src/shared/Database/dbcfile.h
@@ -107,3 +107,4 @@ class DBCFile
         unsigned char *stringTable;
 };
 #endif
+