aboutsummaryrefslogtreecommitdiff
path: root/src/framework
diff options
context:
space:
mode:
authormaximius <none@none>2009-10-17 16:20:24 -0700
committermaximius <none@none>2009-10-17 16:20:24 -0700
commit3f338cc1c328c7280957583b50598292cd8fb64b (patch)
treeca209c2cd024e3902b7844b3224bceff7c5bb570 /src/framework
parente585187b248f48b3c6e9247b49fa07c6565d65e5 (diff)
*Massive cleanup redux.
--HG-- branch : trunk
Diffstat (limited to 'src/framework')
-rw-r--r--src/framework/Dynamic/ObjectRegistry.h4
-rw-r--r--src/framework/GameSystem/NGrid.h10
-rw-r--r--src/framework/Platform/Define.h1
-rw-r--r--src/framework/Utilities/EventProcessor.cpp2
-rw-r--r--src/framework/Utilities/LinkedList.h2
5 files changed, 8 insertions, 11 deletions
diff --git a/src/framework/Dynamic/ObjectRegistry.h b/src/framework/Dynamic/ObjectRegistry.h
index 8c2659e8f53..d2e0ffc35cc 100644
--- a/src/framework/Dynamic/ObjectRegistry.h
+++ b/src/framework/Dynamic/ObjectRegistry.h
@@ -83,7 +83,7 @@ class TRINITY_DLL_DECL ObjectRegistry
{
unsigned int sz = l.size();
l.resize(sz + i_registeredObjects.size());
- for(typename RegistryMapType::const_iterator iter = i_registeredObjects.begin(); iter != i_registeredObjects.end(); ++iter)
+ for (typename RegistryMapType::const_iterator iter = i_registeredObjects.begin(); iter != i_registeredObjects.end(); ++iter)
l[sz++] = iter->first;
return i_registeredObjects.size();
}
@@ -102,7 +102,7 @@ class TRINITY_DLL_DECL ObjectRegistry
ObjectRegistry() {}
~ObjectRegistry()
{
- for(typename RegistryMapType::iterator iter=i_registeredObjects.begin(); iter != i_registeredObjects.end(); ++iter)
+ for (typename RegistryMapType::iterator iter=i_registeredObjects.begin(); iter != i_registeredObjects.end(); ++iter)
delete iter->second;
i_registeredObjects.clear();
}
diff --git a/src/framework/GameSystem/NGrid.h b/src/framework/GameSystem/NGrid.h
index 6ba5d10ffc1..ecb00e6d6f4 100644
--- a/src/framework/GameSystem/NGrid.h
+++ b/src/framework/GameSystem/NGrid.h
@@ -87,7 +87,7 @@ class TRINITY_DLL_DECL NGrid
ASSERT(y < N);
return i_cells[x][y];
}
-
+
GridType& operator()(unsigned short x, unsigned short y)
{
ASSERT(x < N);
@@ -131,8 +131,8 @@ class TRINITY_DLL_DECL NGrid
template<class T, class TT> void Visit(TypeContainerVisitor<T, TypeMapContainer<TT> > &visitor)
{
- for(unsigned int x=0; x < N; ++x)
- for(unsigned int y=0; y < N; ++y)
+ for (unsigned int x=0; x < N; ++x)
+ for (unsigned int y=0; y < N; ++y)
getGridType(x, y).Visit(visitor);
}
@@ -144,8 +144,8 @@ class TRINITY_DLL_DECL NGrid
unsigned int ActiveObjectsInGrid(void) const
{
unsigned int count=0;
- for(unsigned int x=0; x < N; ++x)
- for(unsigned int y=0; y < N; ++y)
+ for (unsigned int x=0; x < N; ++x)
+ for (unsigned int y=0; y < N; ++y)
count += i_cells[x][y].ActiveObjectsInGrid();
return count;
}
diff --git a/src/framework/Platform/Define.h b/src/framework/Platform/Define.h
index d29a53dbf31..9e6a34e3869 100644
--- a/src/framework/Platform/Define.h
+++ b/src/framework/Platform/Define.h
@@ -163,6 +163,5 @@ typedef uint64 OBJECT_HANDLE;
#define CLIENT_VER 313
#endif
-
#endif //TRINITY_DEFINE_H
diff --git a/src/framework/Utilities/EventProcessor.cpp b/src/framework/Utilities/EventProcessor.cpp
index 852f84bc4e2..d3b8bd20d67 100644
--- a/src/framework/Utilities/EventProcessor.cpp
+++ b/src/framework/Utilities/EventProcessor.cpp
@@ -66,7 +66,7 @@ void EventProcessor::KillAllEvents(bool force)
m_aborting = true;
// first, abort all existing events
- for (EventList::iterator i = m_events.begin(); i != m_events.end();)
+ for (EventList::iterator i = m_events.begin(); i != m_events.end(); )
{
EventList::iterator i_old = i;
++i;
diff --git a/src/framework/Utilities/LinkedList.h b/src/framework/Utilities/LinkedList.h
index 171ff3601e3..12fa878d07f 100644
--- a/src/framework/Utilities/LinkedList.h
+++ b/src/framework/Utilities/LinkedList.h
@@ -145,7 +145,6 @@ class LinkedListHead
typedef _Ty& reference;
typedef _Ty const & const_reference;
-
Iterator() : _Ptr(0)
{ // construct with null node pointer
}
@@ -231,7 +230,6 @@ class LinkedListHead
return (_Ptr != &_Right);
}
-
pointer _Mynode()
{ // return node pointer
return (_Ptr);