*Merge.

--HG--
branch : trunk

34 files changed, 34 insertions, 0 deletions

diff --git a/src/shared/Database/DBCEnums.h b/src/shared/Database/DBCEnums.h
index e546b1f7828..ee4f165f898 100644
--- a/src/shared/Database/DBCEnums.h
+++ b/src/shared/Database/DBCEnums.h
@@ -321,3 +321,4 @@ enum SummonFlags
 };
 */
 #endif
+
diff --git a/src/shared/Database/DBCStores.cpp b/src/shared/Database/DBCStores.cpp
index 6e49a344b1a..8890ad0eb1e 100644
--- a/src/shared/Database/DBCStores.cpp
+++ b/src/shared/Database/DBCStores.cpp
@@ -709,3 +709,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 4a67164a773..8a7ee02cc95 100644
--- a/src/shared/Database/DBCStores.h
+++ b/src/shared/Database/DBCStores.h
@@ -221,3 +221,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 4be24d9e24b..975dbf300f1 100644
--- a/src/shared/Database/DBCStructure.h
+++ b/src/shared/Database/DBCStructure.h
@@ -1578,3 +1578,4 @@ typedef std::vector<TaxiPathNodeList> TaxiPathNodesByPath;
 #define TaxiMaskSize 12
 typedef uint32 TaxiMask[TaxiMaskSize];
 #endif
+
diff --git a/src/shared/Database/Database.cpp b/src/shared/Database/Database.cpp
index 5d7f5bf473e..07ece3b0cd9 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 beff0fb740a..92a1c991dcc 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 df1f51adbe7..9366d1e0070 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 c9a02a0a4a1..3d3c53f0873 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 7e67861d883..e7babedddfe 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 6dbaf4a59ab..2fa157e75a5 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 8f8cf95b429..502808b7933 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 9a2aeb84a07..c7242add572 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 a3fffd8aa4c..b5def933723 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 a9593989143..c84b59eea80 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 18831e23687..9a1fbfa5178 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 a4514c963cd..da6a865c6f2 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 5f3e66de722..fcebe3fbd35 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 bd6a2bf962d..8d219bd9c1e 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 0fab7a3633b..01da45ed281 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 8ae59b350d8..5bc11ae308f 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 39d2985ad77..06b1353c12e 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 e10905f0feb..500ca053885 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 aa183ab4b96..30d69114dc6 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 9a32e36bc84..06a02d1db59 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 d3462977e49..5dc3287b385 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 2f4f4534b3a..2401f715074 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 f2250410c26..1b5b9d5dcf1 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 b820d68619b..6cb67832f02 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 a35090adb7e..27f58510a0a 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 1fc35741fc5..cbae0c1e5eb 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 233eed1e4cb..68f5759a85e 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 b7c84b5d6cf..61eef4bb7c4 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 f0b7e6e3c15..c40c8b223e1 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 470322326aa..e94417b4371 100644
--- a/src/shared/Database/dbcfile.h
+++ b/src/shared/Database/dbcfile.h
@@ -107,3 +107,4 @@ class DBCFile
         unsigned char *stringTable;
 };
 #endif
+