Various Cleanups (framework/)

This commit is contained in:
Schmoozerd 2012-07-19 21:54:46 +02:00
parent 8951eed780
commit 9753625fd1
23 changed files with 239 additions and 224 deletions

View file

@ -33,22 +33,22 @@ template<class T, class Key = std::string>
class MANGOS_DLL_DECL ObjectRegistry
{
public:
typedef std::map<Key, T *> RegistryMapType;
typedef std::map<Key, T*> RegistryMapType;
/// Returns a registry item
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);
}
/// Inserts a registry item
bool InsertItem(T *obj, Key key, bool replace = false)
bool InsertItem(T* obj, Key key, bool replace = false)
{
typename RegistryMapType::iterator iter = i_registeredObjects.find(key);
if( iter != i_registeredObjects.end() )
if (iter != i_registeredObjects.end())
{
if( !replace )
if (!replace)
return false;
delete iter->second;
i_registeredObjects.erase(iter);
@ -62,9 +62,9 @@ class MANGOS_DLL_DECL 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);
}
@ -77,17 +77,17 @@ class MANGOS_DLL_DECL ObjectRegistry
}
/// Inefficiently return a vector of registered items
unsigned int GetRegisteredItems(std::vector<Key> &l) const
unsigned int GetRegisteredItems(std::vector<Key>& l) const
{
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();
}
/// Return the map of registered items
RegistryMapType const &GetRegisteredItems() const
RegistryMapType const& GetRegisteredItems() const
{
return i_registeredObjects;
}
@ -100,7 +100,7 @@ class MANGOS_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();
}