aboutsummaryrefslogtreecommitdiff
path: root/src/server/shared/Dynamic
diff options
context:
space:
mode:
authorSpp <spp@jorge.gr>2011-09-29 12:43:05 +0200
committerSpp <spp@jorge.gr>2011-09-29 12:43:05 +0200
commitb16d2245bbd374805d15cdca585e8b42bf139605 (patch)
treeb7b63c567112e1999a2566611363cf5e83adb1be /src/server/shared/Dynamic
parent8b820baa7324d41df264f48e344d62584bff70f8 (diff)
Cosmetic: Multiple cosmetic changes
- Added missing space to 'if', 'for', 'while' and 'switch' when it's followed by '(' - Added missing space after a comma and remove space before comma (with some exceptions) - Remove trailing spaces - Convert tab to spaces Note: Only affects files with extension "cpp" and "h" under /src/server
Diffstat (limited to 'src/server/shared/Dynamic')
-rwxr-xr-xsrc/server/shared/Dynamic/LinkedList.h6
-rwxr-xr-xsrc/server/shared/Dynamic/LinkedReference/RefManager.h2
-rwxr-xr-xsrc/server/shared/Dynamic/LinkedReference/Reference.h4
-rwxr-xr-xsrc/server/shared/Dynamic/ObjectRegistry.h8
-rwxr-xr-xsrc/server/shared/Dynamic/TypeContainerFunctionsPtr.h4
5 files changed, 12 insertions, 12 deletions
diff --git a/src/server/shared/Dynamic/LinkedList.h b/src/server/shared/Dynamic/LinkedList.h
index 95e7261405d..19a2bb1c8cf 100755
--- a/src/server/shared/Dynamic/LinkedList.h
+++ b/src/server/shared/Dynamic/LinkedList.h
@@ -51,7 +51,7 @@ class LinkedListElement
void delink()
{
- if(isInList())
+ if (isInList())
{
iNext->iPrev = iPrev; iPrev->iNext = iNext; iNext = NULL; iPrev = NULL;
}
@@ -112,11 +112,11 @@ class LinkedListHead
uint32 getSize() const
{
- if(!iSize)
+ if (!iSize)
{
uint32 result = 0;
LinkedListElement const* e = getFirst();
- while(e)
+ while (e)
{
++result;
e = e->next();
diff --git a/src/server/shared/Dynamic/LinkedReference/RefManager.h b/src/server/shared/Dynamic/LinkedReference/RefManager.h
index da8cf518de5..ab56de9bc24 100755
--- a/src/server/shared/Dynamic/LinkedReference/RefManager.h
+++ b/src/server/shared/Dynamic/LinkedReference/RefManager.h
@@ -43,7 +43,7 @@ template <class TO, class FROM> class RefManager : public LinkedListHead
void clearReferences()
{
LinkedListElement* ref;
- while((ref = getFirst()) != NULL)
+ while ((ref = getFirst()) != NULL)
{
((Reference<TO, FROM>*) ref)->invalidate();
ref->delink(); // the delink might be already done by invalidate(), but doing it here again does not hurt and insures an empty list
diff --git a/src/server/shared/Dynamic/LinkedReference/Reference.h b/src/server/shared/Dynamic/LinkedReference/Reference.h
index 8570b3e1f1f..fd5ce8fc25b 100755
--- a/src/server/shared/Dynamic/LinkedReference/Reference.h
+++ b/src/server/shared/Dynamic/LinkedReference/Reference.h
@@ -45,9 +45,9 @@ template <class TO, class FROM> class Reference : public LinkedListElement
void link(TO* toObj, FROM* fromObj)
{
assert(fromObj); // fromObj MUST not be NULL
- if(isValid())
+ if (isValid())
unlink();
- if(toObj != NULL)
+ if (toObj != NULL)
{
iRefTo = toObj;
iRefFrom = fromObj;
diff --git a/src/server/shared/Dynamic/ObjectRegistry.h b/src/server/shared/Dynamic/ObjectRegistry.h
index da255d40e86..db5e28eff8f 100755
--- a/src/server/shared/Dynamic/ObjectRegistry.h
+++ b/src/server/shared/Dynamic/ObjectRegistry.h
@@ -46,9 +46,9 @@ class ObjectRegistry
bool InsertItem(T *obj, Key key, bool override = false)
{
typename RegistryMapType::iterator iter = i_registeredObjects.find(key);
- if( iter != i_registeredObjects.end() )
+ if ( iter != i_registeredObjects.end() )
{
- if( !override )
+ if ( !override )
return false;
delete iter->second;
i_registeredObjects.erase(iter);
@@ -62,9 +62,9 @@ class ObjectRegistry
void RemoveItem(Key key, bool delete_object = true)
{
typename RegistryMapType::iterator iter = i_registeredObjects.find(key);
- if( iter != i_registeredObjects.end() )
+ if ( iter != i_registeredObjects.end() )
{
- if( delete_object )
+ if ( delete_object )
delete iter->second;
i_registeredObjects.erase(iter);
}
diff --git a/src/server/shared/Dynamic/TypeContainerFunctionsPtr.h b/src/server/shared/Dynamic/TypeContainerFunctionsPtr.h
index 9b43e325806..7b03f8503b5 100755
--- a/src/server/shared/Dynamic/TypeContainerFunctionsPtr.h
+++ b/src/server/shared/Dynamic/TypeContainerFunctionsPtr.h
@@ -101,7 +101,7 @@ namespace Trinity
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)
+ if (!t)
t = Find(elements._TailElement, hdl, fake);
return t;
@@ -136,7 +136,7 @@ namespace Trinity
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);
- if( iter != elements._element.end() )
+ if ( iter != elements._element.end() )
{
elements._element.erase(iter);
return true;