X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fextensible.h;h=bcc4992bb4867cf1fcad7923ecb8a4750a23b9a3;hb=4c751dbbe8945e5efc230a59b0ed51c2ba10cf92;hp=ff7bce477b767ea1aa2af98ed97b172c524d6f2c;hpb=e80a1296a096ff2c495b3cd2a3913d5e5f6ec450;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/extensible.h b/include/extensible.h
index ff7bce477..bcc4992bb 100644
--- a/include/extensible.h
+++ b/include/extensible.h
@@ -1,5 +1,26 @@
-class Extensible;
-class Module;
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#ifndef EXTENSIBLE_H
+#define EXTENSIBLE_H
+
+#include <stdint.h>
 
 enum SerializeFormat
 {
@@ -15,11 +36,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 +76,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,16 +91,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);
+	bool Register(ExtensionItem* item);
+	void BeginUnregister(Module* module, std::vector<reference<ExtensionItem> >& list);
 	ExtensionItem* GetItem(const std::string& name);
 };
 
@@ -113,17 +134,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);
@@ -180,3 +190,5 @@ class CoreExport StringExtItem : public ExtensionItem
 	void unset(Extensible* container);
 	void free(void* item);
 };
+
+#endif