Release v2.0.23

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

diff --git a/include/extensible.h b/include/extensible.h
index ca9c44546d2a88323a621965e6c72ddc73247d8e..bcc4992bb4867cf1fcad7923ecb8a4750a23b9a3 100644 (file)
--- 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,17 +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);
 };
 
@@ -114,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);
@@ -181,3 +190,5 @@ class CoreExport StringExtItem : public ExtensionItem
        void unset(Extensible* container);
        void free(void* item);
 };
+
+#endif