aboutsummaryrefslogtreecommitdiff
path: root/src/framework/Dynamic/ObjectRegistry.h
diff options
context:
space:
mode:
authormaximius <none@none>2009-10-17 15:35:07 -0700
committermaximius <none@none>2009-10-17 15:35:07 -0700
commit26b5e033ffde3d161382fc9addbfa99738379641 (patch)
treea344f369ca32945f787a02dee35c3dbe342bed7e /src/framework/Dynamic/ObjectRegistry.h
parentf21f47005dcb6b76e1abc9f35fbcd03eed191bff (diff)
*Massive cleanup (\n\n -> \n, *\n -> \n, cleanup for(...) to for (...), and some other cleanups by hand)
*Fix a possible crash in Spell::DoAllEffectOnTarget --HG-- branch : trunk
Diffstat (limited to 'src/framework/Dynamic/ObjectRegistry.h')
-rw-r--r--src/framework/Dynamic/ObjectRegistry.h13
1 files changed, 0 insertions, 13 deletions
diff --git a/src/framework/Dynamic/ObjectRegistry.h b/src/framework/Dynamic/ObjectRegistry.h
index 8c2659e8f53..d266c280eb5 100644
--- a/src/framework/Dynamic/ObjectRegistry.h
+++ b/src/framework/Dynamic/ObjectRegistry.h
@@ -17,18 +17,14 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
#ifndef TRINITY_OBJECTREGISTRY_H
#define TRINITY_OBJECTREGISTRY_H
-
#include "Platform/Define.h"
#include "Utilities/UnorderedMap.h"
#include "Policies/Singleton.h"
-
#include <string>
#include <vector>
#include <map>
-
/** ObjectRegistry holds all registry item of the same type
*/
template<class T, class Key = std::string>
@@ -36,14 +32,12 @@ class TRINITY_DLL_DECL ObjectRegistry
{
public:
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 );
}
-
/// Inserts a registry item
bool InsertItem(T *obj, Key key, bool override = false)
{
@@ -55,11 +49,9 @@ class TRINITY_DLL_DECL ObjectRegistry
delete iter->second;
i_registeredObjects.erase(iter);
}
-
i_registeredObjects[key] = obj;
return true;
}
-
/// Removes a registry item
void RemoveItem(Key key, bool delete_object = true)
{
@@ -71,13 +63,11 @@ class TRINITY_DLL_DECL ObjectRegistry
i_registeredObjects.erase(iter);
}
}
-
/// Returns true if registry contains an item
bool HasItem(Key key) const
{
return (i_registeredObjects.find(key) != i_registeredObjects.end());
}
-
/// Inefficiently return a vector of registered items
unsigned int GetRegisteredItems(std::vector<Key> &l) const
{
@@ -87,17 +77,14 @@ class TRINITY_DLL_DECL ObjectRegistry
l[sz++] = iter->first;
return i_registeredObjects.size();
}
-
/// Return the map of registered items
RegistryMapType const &GetRegisteredItems() const
{
return i_registeredObjects;
}
-
private:
RegistryMapType i_registeredObjects;
friend class Trinity::OperatorNew<ObjectRegistry<T, Key> >;
-
// protected for friend use since it should be a singleton
ObjectRegistry() {}
~ObjectRegistry()