X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fextensible.h;h=b6e7da5d2a94218cefad02bb185590626e211bcb;hb=80c09792394a213f19d1384e61fdf8dfc3fce49a;hp=3f59982318a2e14ce8783e872dd11eb71d2fd557;hpb=0ed3ef9dee2cb8f4b0c37da218a2fd1eee8c31f6;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/extensible.h b/include/extensible.h
index 3f5998231..b6e7da5d2 100644
--- a/include/extensible.h
+++ b/include/extensible.h
@@ -21,6 +21,7 @@ class CoreExport ExtensionItem
 	const std::string key;
 	Module* const owner;
 	ExtensionItem(const std::string& key, Module* owner);
+	virtual ~ExtensionItem();
 	/** Serialize this item into a string
 	 *
 	 * @param format The format to serialize to
@@ -47,7 +48,7 @@ class CoreExport ExtensionItem
 };
 
 /** A private data store for an Extensible class */
-typedef std::map<std::string,void*> ExtensibleStore;
+CoreExport typedef std::map<std::string,void*> ExtensibleStore;
 
 /** class Extensible is the parent class of many classes such as User and Channel.
  * class Extensible implements a system which allows modules to 'extend' the class by attaching data within
@@ -81,8 +82,9 @@ class CoreExport Extensible : public classbase
 	virtual ~Extensible();
 
 	static bool Register(ExtensionItem* item);
-	static void UnRegister(Module* module);
-	
+	static std::vector<ExtensionItem*> BeginUnregister(Module* module);
+	void doUnhookExtensions(const std::vector<ExtensionItem*>& toRemove);
+
 	// Friend access for the protected getter/setter
 	friend class ExtensionItem;
 };
@@ -92,6 +94,7 @@ class CoreExport LocalExtItem : public ExtensionItem
 {
  public:
 	LocalExtItem(const std::string& key, Module* owner);
+	virtual ~LocalExtItem();
 	virtual std::string serialize(SerializeFormat format, const Extensible* container, void* item);
 	virtual void unserialize(SerializeFormat format, Extensible* container, const std::string& value);
 	virtual void free(void* item) = 0;
@@ -105,6 +108,10 @@ class CoreExport SimpleExtItem : public LocalExtItem
 	{
 	}
 
+	virtual ~SimpleExtItem()
+	{
+	}
+
 	inline T* get(const Extensible* container)
 	{
 		return static_cast<T*>(get_raw(container));
@@ -150,6 +157,7 @@ class CoreExport LocalStringExt : public SimpleExtItem<std::string>
 {
  public:
 	LocalStringExt(const std::string& key, Module* owner);
+	virtual ~LocalStringExt();
 	std::string serialize(SerializeFormat format, const Extensible* container, void* item);
 };
 
@@ -157,6 +165,7 @@ class CoreExport LocalIntExt : public LocalExtItem
 {
  public:
 	LocalIntExt(const std::string& key, Module* owner);
+	virtual ~LocalIntExt();
 	std::string serialize(SerializeFormat format, const Extensible* container, void* item);
 	intptr_t get(const Extensible* container);
 	intptr_t set(Extensible* container, intptr_t value);
@@ -167,6 +176,7 @@ class CoreExport StringExtItem : public ExtensionItem
 {
  public:
 	StringExtItem(const std::string& key, Module* owner);
+	virtual ~StringExtItem();
 	std::string* get(const Extensible* container);
 	std::string serialize(SerializeFormat format, const Extensible* container, void* item);
 	void unserialize(SerializeFormat format, Extensible* container, const std::string& value);