*apply trinity style to whole source

*comment out all mangos to trinity defines
*this will make merging a little harder, but code will be more clear

--HG--
branch : trunk

2 files changed, 2 insertions, 2 deletions

diff --git a/src/shared/Database/QueryResult.h b/src/shared/Database/QueryResult.h
index 7f213850aa6..df20dc8578e 100644
--- a/src/shared/Database/QueryResult.h
+++ b/src/shared/Database/QueryResult.h
@@ -46,7 +46,7 @@ class TRINITY_DLL_SPEC QueryResult
 
 typedef std::vector<std::string> QueryFieldNames;
 
-class MANGOS_DLL_SPEC QueryNamedResult
+class TRINITY_DLL_SPEC QueryNamedResult
 {
     public:
         explicit QueryNamedResult(QueryResult* query, QueryFieldNames const& names) : mQuery(query), mFieldNames(names) {}
diff --git a/src/shared/Database/SqlOperations.h b/src/shared/Database/SqlOperations.h
index e91d83b6611..51cafd20b9f 100644
--- a/src/shared/Database/SqlOperations.h
+++ b/src/shared/Database/SqlOperations.h
@@ -71,7 +71,7 @@ class SqlResultQueue;                                       /// queue for thread
 class SqlQueryHolder;                                       /// groups several async quries
 class SqlQueryHolderEx;                                     /// points to a holder, added to the delay thread
 
-class SqlResultQueue : public ACE_Based::LockedQueue<MaNGOS::IQueryCallback* , ACE_Thread_Mutex>
+class SqlResultQueue : public ACE_Based::LockedQueue<Trinity::IQueryCallback* , ACE_Thread_Mutex>
 {
     public:
         SqlResultQueue() {}