X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fextensible.h;h=d4c7a86d1f9c627a192f960036d701f7d6e67d0f;hb=511c11b8da024363fe2711a5ea9d600326073c8c;hp=ca9c44546d2a88323a621965e6c72ddc73247d8e;hpb=9db7af579c46a9f0379fdf71fb773a0a76a94846;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/extensible.h b/include/extensible.h
index ca9c44546..d4c7a86d1 100644
--- a/include/extensible.h
+++ b/include/extensible.h
@@ -1,6 +1,3 @@
-class Extensible;
-class Module;
-
 enum SerializeFormat
 {
 	/** Shown to a human (does not need to be unserializable) */
@@ -15,11 +12,9 @@ enum SerializeFormat
 
 /** Class represnting an extension of some object
  */
-class CoreExport ExtensionItem
+class CoreExport ExtensionItem : public ServiceProvider, public usecountbase
 {
  public:
-	const std::string key;
-	Module* const owner;
 	ExtensionItem(const std::string& key, Module* owner);
 	virtual ~ExtensionItem();
 	/** Serialize this item into a string
@@ -57,7 +52,7 @@ class CoreExport ExtensionItem
 class CoreExport Extensible : public classbase
 {
  public:
-	typedef std::map<ExtensionItem*,void*> ExtensibleStore;
+	typedef std::map<reference<ExtensionItem>,void*> ExtensibleStore;
 
 	// Friend access for the protected getter/setter
 	friend class ExtensionItem;
@@ -72,17 +67,18 @@ class CoreExport Extensible : public classbase
 	 */
 	inline const ExtensibleStore& GetExtList() const { return extensions; }
 
+	Extensible();
 	virtual CullResult cull();
 	virtual ~Extensible();
-	void doUnhookExtensions(const std::vector<ExtensionItem*>& toRemove);
+	void doUnhookExtensions(const std::vector<reference<ExtensionItem> >& toRemove);
 };
 
 class CoreExport ExtensionManager
 {
-	std::map<std::string, ExtensionItem*> types;
+	std::map<std::string, reference<ExtensionItem> > types;
  public:
 	void Register(ExtensionItem* item);
-	void BeginUnregister(Module* module, std::vector<ExtensionItem*>& list);
+	void BeginUnregister(Module* module, std::vector<reference<ExtensionItem> >& list);
 	ExtensionItem* GetItem(const std::string& name);
 };
 
@@ -114,17 +110,6 @@ class SimpleExtItem : public LocalExtItem
 		return static_cast<T*>(get_raw(container));
 	}
 
-	inline T* getNew(Extensible* container) const
-	{
-		T* ptr = get(container);
-		if (!ptr)
-		{
-			ptr = new T;
-			set_raw(container, ptr);
-		}
-		return ptr;
-	}
-
 	inline void set(Extensible* container, const T& value)
 	{
 		T* ptr = new T(value);