m_dnsbl updates

[user/henk/code/inspircd.git] / include / extensible.h

diff --git a/include/extensible.h b/include/extensible.h
index 449c7b38a46c58fccc66822eb9f72b17092c341d..d4c7a86d1f9c627a192f960036d701f7d6e67d0f 100644 (file)
--- 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);
 };