refactor(Core/Common): restyle tools with astyle (#3706)

src/common/Collision/BoundingIntervalHierarchyWrapper.h

@@ -13,7 +13,7 @@
 #include "BoundingIntervalHierarchy.h"
 
 
-template<class T, class BoundsFunc = BoundsTrait<T> >
+template<class T, class BoundsFunc = BoundsTrait<T>>
 class BIHWrap
 {
     template<class RayCallback>

src/common/Collision/DynamicTree.cpp

@@ -50,7 +50,7 @@ static bool operator == (const GameObjectModel& mdl, const GameObjectModel& mdl2
 }
 */
 
-typedef RegularGrid2D<GameObjectModel, BIHWrap<GameObjectModel> > ParentTree;
+typedef RegularGrid2D<GameObjectModel, BIHWrap<GameObjectModel>> ParentTree;
 
 struct DynTreeImpl : public ParentTree/*, public Intersectable*/
 {

src/common/Collision/Management/IVMapManager.h

@@ -71,9 +71,9 @@ namespace VMAP
         */
         void setEnableHeightCalc(bool pVal) { iEnableHeightCalc = pVal; }
 
-        bool isLineOfSightCalcEnabled() const { return(iEnableLineOfSightCalc); }
+        bool isLineOfSightCalcEnabled() const { return (iEnableLineOfSightCalc); }
-        bool isHeightCalcEnabled() const { return(iEnableHeightCalc); }
+        bool isHeightCalcEnabled() const { return (iEnableHeightCalc); }
-        bool isMapLoadingEnabled() const { return(iEnableLineOfSightCalc || iEnableHeightCalc  ); }
+        bool isMapLoadingEnabled() const { return (iEnableLineOfSightCalc || iEnableHeightCalc  ); }
 
         virtual std::string getDirFileName(unsigned int pMapId, int x, int y) const = 0;
         /**

src/common/Collision/Management/MMapManager.cpp

@@ -96,7 +96,7 @@ namespace MMAP
         ACORE_WRITE_GUARD(ACE_RW_Thread_Mutex, MMapManagerLock);
 
         // make sure the mmap is loaded and ready to load tiles
-        if(!loadMapData(mapId))
+        if (!loadMapData(mapId))
             return false;
 
         // get this mmap data
@@ -148,7 +148,7 @@ namespace MMAP
         ASSERT(data);
 
         size_t result = fread(data, fileHeader.size, 1, file);
-        if(!result)
+        if (!result)
         {
             sLog->outError("MMAP:loadMap: Bad header or data in mmap %03u%02i%02i.mmtile", mapId, x, y);
             fclose(file);

src/common/Collision/Maps/MapTree.cpp

@@ -220,7 +220,7 @@ namespace VMAP
         {
             height = pPos.z - maxDist;
         }
-        return(height);
+        return (height);
     }
 
     //=========================================================

src/common/Collision/Maps/TileAssembler.cpp

@@ -37,7 +37,7 @@ namespace VMAP
     {
         Vector3 out = pIn * iScale;
         out = iRotation * out;
-        return(out);
+        return (out);
     }
 
     //=================================================================

src/common/Collision/RegularGrid.h

@@ -52,7 +52,7 @@ public:
 #define HGRID_MAP_SIZE  (533.33333f * 64.f)     // shouldn't be changed
 #define CELL_SIZE       float(HGRID_MAP_SIZE/(float)CELL_NUMBER)
 
-    typedef G3D::Table<const T*, NodeArray<Node> > MemberTable;
+    typedef G3D::Table<const T*, NodeArray<Node>> MemberTable;
 
     MemberTable memberTable;
     Node* nodes[CELL_NUMBER][CELL_NUMBER];

src/common/Cryptography/OpenSSLCrypto.cpp

@@ -27,7 +27,7 @@ static void threadIdCallback(CRYPTO_THREADID* id)
 void OpenSSLCrypto::threadsSetup()
 {
     cryptoLocks.resize(CRYPTO_num_locks());
-    for(int i = 0 ; i < CRYPTO_num_locks(); ++i)
+    for (int i = 0 ; i < CRYPTO_num_locks(); ++i)
     {
         cryptoLocks[i] = new std::mutex();
     }
@@ -40,7 +40,7 @@ void OpenSSLCrypto::threadsCleanup()
 {
     CRYPTO_set_locking_callback(nullptr);
     CRYPTO_THREADID_set_callback(nullptr);
-    for(int i = 0 ; i < CRYPTO_num_locks(); ++i)
+    for (int i = 0 ; i < CRYPTO_num_locks(); ++i)
     {
         delete cryptoLocks[i];
     }

src/common/Database/DatabaseWorkerPool.cpp

@@ -10,8 +10,7 @@
 #define MIN_MYSQL_SERVER_VERSION 50600u
 #define MIN_MYSQL_CLIENT_VERSION 50600u
 
-template <class T>
+template <class T> DatabaseWorkerPool<T>::DatabaseWorkerPool() :
-DatabaseWorkerPool<T>::DatabaseWorkerPool() :
     _mqueue(new ACE_Message_Queue<ACE_SYNCH>(2 * 1024 * 1024, 2 * 1024 * 1024)),
     _queue(new ACE_Activation_Queue(_mqueue))
 {

src/common/Database/MySQLConnection.h

@@ -51,7 +51,7 @@ struct MySQLConnectionInfo
     std::string port_or_socket;
 };
 
-typedef std::map<uint32 /*index*/, std::pair<std::string /*query*/, ConnectionFlags /*sync/async*/> > PreparedStatementMap;
+typedef std::map<uint32 /*index*/, std::pair<std::string /*query*/, ConnectionFlags /*sync/async*/>> PreparedStatementMap;
 
 class MySQLConnection
 {

src/common/Debugging/WheatyExceptionReport.cpp

@@ -845,8 +845,7 @@ void WheatyExceptionReport::WriteStackDetails(
 // The function invoked by SymEnumSymbols
 //////////////////////////////////////////////////////////////////////////////
 
-BOOL CALLBACK
+BOOL CALLBACK WheatyExceptionReport::EnumerateSymbolsCallback(
-WheatyExceptionReport::EnumerateSymbolsCallback(
     PSYMBOL_INFO  pSymInfo,
     ULONG         /*SymbolSize*/,
     PVOID         UserContext)
@@ -1361,8 +1360,7 @@ void WheatyExceptionReport::FormatOutputValue(char* pszCurrBuffer,
     }
 }
 
-BasicType
+BasicType WheatyExceptionReport::GetBasicType(DWORD typeIndex, DWORD64 modBase)
-WheatyExceptionReport::GetBasicType(DWORD typeIndex, DWORD64 modBase)
 {
     BasicType basicType;
     if (SymGetTypeInfo(m_hProcess, modBase, typeIndex,

src/common/Dynamic/LinkedList.h

@@ -24,9 +24,9 @@ public:
     LinkedListElement(): iNext(NULL), iPrev(NULL) { }
     ~LinkedListElement() { delink(); }
 
-    bool hasNext() const { return(iNext && iNext->iNext != NULL); }
+    bool hasNext() const { return (iNext && iNext->iNext != NULL); }
-    bool hasPrev() const { return(iPrev && iPrev->iPrev != NULL); }
+    bool hasPrev() const { return (iPrev && iPrev->iPrev != NULL); }
-    bool isInList() const { return(iNext != NULL && iPrev != NULL); }
+    bool isInList() const { return (iNext != NULL && iPrev != NULL); }
 
     LinkedListElement*       next()       { return hasNext() ? iNext : NULL; }
     LinkedListElement const* next() const { return hasNext() ? iNext : NULL; }
@@ -83,13 +83,13 @@ public:
         iLast.iPrev = &iFirst;
     }
 
-    bool isEmpty() const { return(!iFirst.iNext->isInList()); }
+    bool isEmpty() const { return (!iFirst.iNext->isInList()); }
 
-    LinkedListElement*       getFirst()       { return(isEmpty() ? NULL : iFirst.iNext); }
+    LinkedListElement*       getFirst()       { return (isEmpty() ? NULL : iFirst.iNext); }
-    LinkedListElement const* getFirst() const { return(isEmpty() ? NULL : iFirst.iNext); }
+    LinkedListElement const* getFirst() const { return (isEmpty() ? NULL : iFirst.iNext); }
 
-    LinkedListElement*       getLast() { return(isEmpty() ? NULL : iLast.iPrev); }
+    LinkedListElement*       getLast() { return (isEmpty() ? NULL : iLast.iPrev); }
-    LinkedListElement const* getLast() const  { return(isEmpty() ? NULL : iLast.iPrev); }
+    LinkedListElement const* getLast() const  { return (isEmpty() ? NULL : iLast.iPrev); }
 
     void insertFirst(LinkedListElement* pElem)
     {

src/common/Dynamic/LinkedReference/RefManager.h

@@ -14,7 +14,7 @@
 template <class TO, class FROM> class RefManager : public LinkedListHead
 {
 public:
-    typedef LinkedListHead::Iterator< Reference<TO, FROM> > iterator;
+    typedef LinkedListHead::Iterator< Reference<TO, FROM>> iterator;
     RefManager() { }
     virtual ~RefManager() { clearReferences(); }
 

src/common/Dynamic/LinkedReference/Reference.h

@@ -68,15 +68,15 @@ public:
         return iRefTo != NULL;
     }
 
-    Reference<TO, FROM>*        next()       { return((Reference<TO, FROM>*) LinkedListElement::next()); }
+    Reference<TO, FROM>*        next()       { return ((Reference<TO, FROM>*) LinkedListElement::next()); }
-    Reference<TO, FROM> const* next() const { return((Reference<TO, FROM> const*) LinkedListElement::next()); }
+    Reference<TO, FROM> const* next() const { return ((Reference<TO, FROM> const*) LinkedListElement::next()); }
-    Reference<TO, FROM>*        prev()       { return((Reference<TO, FROM>*) LinkedListElement::prev()); }
+    Reference<TO, FROM>*        prev()       { return ((Reference<TO, FROM>*) LinkedListElement::prev()); }
-    Reference<TO, FROM> const* prev() const { return((Reference<TO, FROM> const*) LinkedListElement::prev()); }
+    Reference<TO, FROM> const* prev() const { return ((Reference<TO, FROM> const*) LinkedListElement::prev()); }
 
-    Reference<TO, FROM>*        nocheck_next()       { return((Reference<TO, FROM>*) LinkedListElement::nocheck_next()); }
+    Reference<TO, FROM>*        nocheck_next()       { return ((Reference<TO, FROM>*) LinkedListElement::nocheck_next()); }
-    Reference<TO, FROM> const* nocheck_next() const { return((Reference<TO, FROM> const*) LinkedListElement::nocheck_next()); }
+    Reference<TO, FROM> const* nocheck_next() const { return ((Reference<TO, FROM> const*) LinkedListElement::nocheck_next()); }
-    Reference<TO, FROM>*        nocheck_prev()       { return((Reference<TO, FROM>*) LinkedListElement::nocheck_prev()); }
+    Reference<TO, FROM>*        nocheck_prev()       { return ((Reference<TO, FROM>*) LinkedListElement::nocheck_prev()); }
-    Reference<TO, FROM> const* nocheck_prev() const { return((Reference<TO, FROM> const*) LinkedListElement::nocheck_prev()); }
+    Reference<TO, FROM> const* nocheck_prev() const { return ((Reference<TO, FROM> const*) LinkedListElement::nocheck_prev()); }
 
     TO* operator ->() const { return iRefTo; }
     TO* getTarget() const { return iRefTo; }

src/common/Dynamic/ObjectRegistry.h

@@ -25,7 +25,7 @@ public:
     const T* GetRegistryItem(Key key) const
     {
         typename RegistryMapType::const_iterator iter = i_registeredObjects.find(key);
-        return( iter == i_registeredObjects.end() ? NULL : iter->second );
+        return ( iter == i_registeredObjects.end() ? NULL : iter->second );
     }
 
     static ObjectRegistry<T, Key>* instance()

src/common/Dynamic/TypeContainer.h

@@ -32,7 +32,7 @@ template<class OBJECT> struct ContainerMapList
 template<> struct ContainerMapList<TypeNull>                /* nothing is in type null */
 {
 };
-template<class H, class T> struct ContainerMapList<TypeList<H, T> >
+template<class H, class T> struct ContainerMapList<TypeList<H, T>>
 {
     ContainerMapList<H> _elements;
     ContainerMapList<T> _TailElements;
@@ -50,7 +50,7 @@ template<class OBJECT> struct ContainerArrayList
 // termination condition
 template<> struct ContainerArrayList<TypeNull> { };
 // recursion
-template<class H, class T> struct ContainerArrayList<TypeList<H, T> >
+template<class H, class T> struct ContainerArrayList<TypeList<H, T>>
 {
     ContainerArrayList<H> _elements;
     ContainerArrayList<T> _TailElements;
@@ -67,7 +67,7 @@ template<class OBJECT> struct ContainerList
 
 /* TypeNull is underfined */
 template<> struct ContainerList<TypeNull> { };
-template<class H, class T> struct ContainerList<TypeList<H, T> >
+template<class H, class T> struct ContainerList<TypeList<H, T>>
 {
     ContainerList<H> _elements;
     ContainerMapList<T> _TailElements;

src/common/Dynamic/TypeContainerFunctions.h

@@ -36,12 +36,12 @@ namespace acore
         return 0;
     }
 
-    template<class SPECIFIC_TYPE, class T> size_t Count(const ContainerMapList<TypeList<SPECIFIC_TYPE, T> >& elements, SPECIFIC_TYPE* fake)
+    template<class SPECIFIC_TYPE, class T> size_t Count(const ContainerMapList<TypeList<SPECIFIC_TYPE, T>>& elements, SPECIFIC_TYPE* fake)
     {
         return Count(elements._elements, fake);
     }
 
-    template<class SPECIFIC_TYPE, class H, class T> size_t Count(const ContainerMapList<TypeList<H, T> >& elements, SPECIFIC_TYPE* fake)
+    template<class SPECIFIC_TYPE, class H, class T> size_t Count(const ContainerMapList<TypeList<H, T>>& elements, SPECIFIC_TYPE* fake)
     {
         return Count(elements._TailElements, fake);
     }
@@ -66,7 +66,7 @@ namespace acore
     }
 
     // Recursion
-    template<class SPECIFIC_TYPE, class H, class T> SPECIFIC_TYPE* Insert(ContainerMapList<TypeList<H, T> >& elements, SPECIFIC_TYPE* obj)
+    template<class SPECIFIC_TYPE, class H, class T> SPECIFIC_TYPE* Insert(ContainerMapList<TypeList<H, T>>& elements, SPECIFIC_TYPE* obj)
     {
         SPECIFIC_TYPE* t = Insert(elements._elements, obj);
         return (t != NULL ? t : Insert(elements._TailElements, obj));

src/common/Dynamic/TypeContainerFunctionsPtr.h

@@ -49,7 +49,7 @@ namespace acore
     // non-const find functions
     template<class SPECIFIC_TYPE> CountedPtr<SPECIFIC_TYPE>& Find(ContainerMapList<SPECIFIC_TYPE>& elements, OBJECT_HANDLE hdl, CountedPtr<SPECIFIC_TYPE>* /*fake*/)
     {
-        typename std::map<OBJECT_HANDLE, CountedPtr<SPECIFIC_TYPE> >::iterator iter = elements._element.find(hdl);
+        typename std::map<OBJECT_HANDLE, CountedPtr<SPECIFIC_TYPE>>::iterator iter = elements._element.find(hdl);
         return (iter == elements._element.end() ? NullPtr<SPECIFIC_TYPE>((SPECIFIC_TYPE*)NULL) : iter->second);
     };
 
@@ -63,7 +63,7 @@ namespace acore
         return NullPtr<SPECIFIC_TYPE>((SPECIFIC_TYPE*)NULL);// this is a missed
     }
 
-    template<class SPECIFIC_TYPE, class H, class T> CountedPtr<SPECIFIC_TYPE>& Find(ContainerMapList<TypeList<H, T> >& elements, OBJECT_HANDLE hdl, CountedPtr<SPECIFIC_TYPE>* fake)
+    template<class SPECIFIC_TYPE, class H, class T> CountedPtr<SPECIFIC_TYPE>& Find(ContainerMapList<TypeList<H, T>>& elements, OBJECT_HANDLE hdl, CountedPtr<SPECIFIC_TYPE>* fake)
     {
         CountedPtr<SPECIFIC_TYPE>& t = Find(elements._elements, hdl, fake);
         return (!t ? Find(elements._TailElements, hdl, fake) : t);
@@ -86,7 +86,7 @@ namespace acore
         return NullPtr<SPECIFIC_TYPE>((SPECIFIC_TYPE*)NULL);
     }
 
-    template<class SPECIFIC_TYPE, class H, class T> CountedPtr<SPECIFIC_TYPE>& Find(const ContainerMapList<TypeList<H, T> >& elements, OBJECT_HANDLE hdl, CountedPtr<SPECIFIC_TYPE>* fake)
+    template<class SPECIFIC_TYPE, class H, class T> CountedPtr<SPECIFIC_TYPE>& Find(const ContainerMapList<TypeList<H, T>>& elements, OBJECT_HANDLE hdl, CountedPtr<SPECIFIC_TYPE>* fake)
     {
         CountedPtr<SPECIFIC_TYPE>& t = Find(elements._elements, hdl, fake);
         if (!t)
@@ -114,7 +114,7 @@ namespace acore
     }
 
     // Recursion
-    template<class SPECIFIC_TYPE, class H, class T> CountedPtr<SPECIFIC_TYPE>& Insert(ContainerMapList<TypeList<H, T> >& elements, CountedPtr<SPECIFIC_TYPE>& obj, OBJECT_HANDLE hdl)
+    template<class SPECIFIC_TYPE, class H, class T> CountedPtr<SPECIFIC_TYPE>& Insert(ContainerMapList<TypeList<H, T>>& elements, CountedPtr<SPECIFIC_TYPE>& obj, OBJECT_HANDLE hdl)
     {
         CountedPtr<SPECIFIC_TYPE>& t = Insert(elements._elements, obj, hdl);
         return (!t ? Insert(elements._TailElements, obj, hdl) : t);
@@ -123,7 +123,7 @@ namespace acore
     // non-const remove method
     template<class SPECIFIC_TYPE> bool Remove(ContainerMapList<SPECIFIC_TYPE>& elements, CountedPtr<SPECIFIC_TYPE>& obj, OBJECT_HANDLE hdl)
     {
-        typename std::map<OBJECT_HANDLE, CountedPtr<SPECIFIC_TYPE> >::iterator iter = elements._element.find(hdl);
+        typename std::map<OBJECT_HANDLE, CountedPtr<SPECIFIC_TYPE>>::iterator iter = elements._element.find(hdl);
         if ( iter != elements._element.end() )
         {
             elements._element.erase(iter);
@@ -144,7 +144,7 @@ namespace acore
         return false;
     }
 
-    template<class SPECIFIC_TYPE, class T, class H> bool Remove(ContainerMapList<TypeList<H, T> >& elements, CountedPtr<SPECIFIC_TYPE>& obj, OBJECT_HANDLE hdl)
+    template<class SPECIFIC_TYPE, class T, class H> bool Remove(ContainerMapList<TypeList<H, T>>& elements, CountedPtr<SPECIFIC_TYPE>& obj, OBJECT_HANDLE hdl)
     {
         // The head element is bad
         bool t = Remove(elements._elements, obj, hdl);

src/common/Dynamic/TypeContainerVisitor.h

@@ -34,7 +34,7 @@ template<class VISITOR, class T> void VisitorHelper(VISITOR& v, ContainerList<T>
 }
 
 // recursion for container list
-template<class VISITOR, class H, class T> void VisitorHelper(VISITOR& v, ContainerList<TypeList<H, T> >& c)
+template<class VISITOR, class H, class T> void VisitorHelper(VISITOR& v, ContainerList<TypeList<H, T>>& c)
 {
     VisitorHelper(v, c._elements);
     VisitorHelper(v, c._TailElements);
@@ -49,7 +49,7 @@ template<class VISITOR, class T> void VisitorHelper(VISITOR& v, ContainerMapList
 }
 
 // recursion container map list
-template<class VISITOR, class H, class T> void VisitorHelper(VISITOR& v, ContainerMapList<TypeList<H, T> >& c)
+template<class VISITOR, class H, class T> void VisitorHelper(VISITOR& v, ContainerMapList<TypeList<H, T>>& c)
 {
     VisitorHelper(v, c._elements);
     VisitorHelper(v, c._TailElements);
@@ -64,7 +64,7 @@ template<class VISITOR, class T> void VisitorHelper(VISITOR& v, ContainerArrayLi
 template<class VISITOR> void VisitorHelper(VISITOR& /*v*/, ContainerArrayList<TypeNull>& /*c*/) { }
 
 // recursion
-template<class VISITOR, class H, class T> void VisitorHelper(VISITOR& v, ContainerArrayList<TypeList<H, T> >& c)
+template<class VISITOR, class H, class T> void VisitorHelper(VISITOR& v, ContainerArrayList<TypeList<H, T>>& c)
 {
     VisitorHelper(v, c._elements);
     VisitorHelper(v, c._TailElements);

src/common/Logging/Log.cpp

@@ -360,7 +360,7 @@ std::string Log::GetTimestampStr()
 
 void Log::outDB(LogTypes type, const char* str)
 {
-    if(!str || std::string(str).empty() || type >= MAX_LOG_TYPES)
+    if (!str || std::string(str).empty() || type >= MAX_LOG_TYPES)
         return;
 
     std::string new_str(str);

src/common/Threading/LockedQueue.h

@@ -15,7 +15,7 @@
 
 namespace ACE_Based
 {
-    template <class T, class LockType, typename StorageType = std::deque<T> >
+    template <class T, class LockType, typename StorageType = std::deque<T>>
     class LockedQueue
     {
         //! Lock access to the queue.

src/common/Utilities/EventProcessor.cpp

@@ -82,7 +82,7 @@ void EventProcessor::AddEvent(BasicEvent* Event, uint64 e_time, bool set_addtime
 
 uint64 EventProcessor::CalculateTime(uint64 t_offset) const
 {
-    return(m_time + t_offset);
+    return (m_time + t_offset);
 }
 
 uint64 EventProcessor::CalculateQueueTime(uint64 delay) const

src/common/Utilities/Util.cpp

@@ -360,7 +360,7 @@ size_t utf8length(std::string& utf8str)
     {
         return utf8::distance(utf8str.c_str(), utf8str.c_str() + utf8str.size());
     }
-    catch(std::exception const&)
+    catch (std::exception const&)
     {
         utf8str.clear();
         return 0;
@@ -382,7 +382,7 @@ void utf8truncate(std::string& utf8str, size_t len)
         char* oend = utf8::utf16to8(wstr.c_str(), wstr.c_str() + wstr.size(), &utf8str[0]);
         utf8str.resize(oend - (&utf8str[0]));               // remove unused tail
     }
-    catch(std::exception const&)
+    catch (std::exception const&)
     {
         utf8str.clear();
     }
@@ -397,7 +397,7 @@ bool Utf8toWStr(char const* utf8str, size_t csize, wchar_t* wstr, size_t& wsize)
         wsize -= out.remaining(); // remaining unused space
         wstr[wsize] = L'\0';
     }
-    catch(std::exception const&)
+    catch (std::exception const&)
     {
         // Replace the converted string with an error message if there is enough space
         // Otherwise just return an empty string
@@ -429,7 +429,7 @@ bool Utf8toWStr(const std::string& utf8str, std::wstring& wstr)
     {
         utf8::utf8to16(utf8str.c_str(), utf8str.c_str() + utf8str.size(), std::back_inserter(wstr));
     }
-    catch(std::exception const&)
+    catch (std::exception const&)
     {
         wstr.clear();
         return false;
@@ -452,7 +452,7 @@ bool WStrToUtf8(wchar_t* wstr, size_t size, std::string& utf8str)
         }
         utf8str = utf8str2;
     }
-    catch(std::exception const&)
+    catch (std::exception const&)
     {
         utf8str.clear();
         return false;
@@ -475,7 +475,7 @@ bool WStrToUtf8(std::wstring const& wstr, std::string& utf8str)
         }
         utf8str = utf8str2;
     }
-    catch(std::exception const&)
+    catch (std::exception const&)
     {
         utf8str.clear();
         return false;

src/common/Utilities/Util.h

@@ -18,7 +18,7 @@
 #include <map>
 #include <ace/INET_Addr.h>
 
- // Searcher for map of structs
+// Searcher for map of structs
 template<typename T, class S> struct Finder
 {
     T val_;