Merge tag 'v2.0.26' into master.

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

diff --git a/include/extensible.h b/include/extensible.h
index b98bb921fd98a2bec8c854bce4e9a3c4fc7b1717..afb1cd5b66e0097def46c36c18e509e341152b19 100644 (file)
--- a/include/extensible.h
+++ b/include/extensible.h
@@ -19,8 +19,6 @@
 
 #pragma once
 
-#include <stdint.h>
-
 enum SerializeFormat
 {
        /** Shown to a human (does not need to be unserializable) */
@@ -38,8 +36,8 @@ enum SerializeFormat
 class CoreExport ExtensionItem : public ServiceProvider, public usecountbase
 {
  public:
-    /** Extensible subclasses
-     */
+       /** Extensible subclasses
+        */
        enum ExtensibleType
        {
                EXT_USER,
@@ -69,6 +67,10 @@ class CoreExport ExtensionItem : public ServiceProvider, public usecountbase
        /** Free the item */
        virtual void free(void* item) = 0;
 
+       /** Register this object in the ExtensionManager
+        */
+       void RegisterService() CXX11_OVERRIDE;
+
  protected:
        /** Get the item from the internal map */
        void* get_raw(const Extensible* container) const;
@@ -109,7 +111,7 @@ class CoreExport Extensible : public classbase
        inline const ExtensibleStore& GetExtList() const { return extensions; }
 
        Extensible();
-       virtual CullResult cull();
+       CullResult cull() CXX11_OVERRIDE;
        virtual ~Extensible();
        void doUnhookExtensions(const std::vector<reference<ExtensionItem> >& toRemove);
 
@@ -128,6 +130,11 @@ class CoreExport ExtensionManager
        void BeginUnregister(Module* module, std::vector<reference<ExtensionItem> >& list);
        ExtensionItem* GetItem(const std::string& name);
 
+       /** Get all registered extensions keyed by their names
+        * @return Const map of ExtensionItem pointers keyed by their names
+        */
+       const ExtMap& GetExts() const { return types; }
+
  private:
        ExtMap types;
 };
@@ -138,9 +145,9 @@ class CoreExport LocalExtItem : public ExtensionItem
  public:
        LocalExtItem(const std::string& key, ExtensibleType exttype, Module* owner);
        virtual ~LocalExtItem();
-       virtual std::string serialize(SerializeFormat format, const Extensible* container, void* item) const;
-       virtual void unserialize(SerializeFormat format, Extensible* container, const std::string& value);
-       virtual void free(void* item) = 0;
+       std::string serialize(SerializeFormat format, const Extensible* container, void* item) const CXX11_OVERRIDE;
+       void unserialize(SerializeFormat format, Extensible* container, const std::string& value) CXX11_OVERRIDE;
+       void free(void* item) CXX11_OVERRIDE = 0;
 };
 
 template <typename T, typename Del = stdalgo::defaultdeleter<T> >
@@ -183,7 +190,7 @@ class SimpleExtItem : public LocalExtItem
                del(old);
        }
 
-       virtual void free(void* item)
+       void free(void* item) CXX11_OVERRIDE
        {
                Del del;
                del(static_cast<T*>(item));
@@ -195,7 +202,8 @@ class CoreExport LocalStringExt : public SimpleExtItem<std::string>
  public:
        LocalStringExt(const std::string& key, ExtensibleType exttype, Module* owner);
        virtual ~LocalStringExt();
-       std::string serialize(SerializeFormat format, const Extensible* container, void* item) const;
+       std::string serialize(SerializeFormat format, const Extensible* container, void* item) const CXX11_OVERRIDE;
+       void unserialize(SerializeFormat format, Extensible* container, const std::string& value) CXX11_OVERRIDE;
 };
 
 class CoreExport LocalIntExt : public LocalExtItem
@@ -203,11 +211,12 @@ class CoreExport LocalIntExt : public LocalExtItem
  public:
        LocalIntExt(const std::string& key, ExtensibleType exttype, Module* owner);
        virtual ~LocalIntExt();
-       std::string serialize(SerializeFormat format, const Extensible* container, void* item) const;
+       std::string serialize(SerializeFormat format, const Extensible* container, void* item) const CXX11_OVERRIDE;
+       void unserialize(SerializeFormat format, Extensible* container, const std::string& value) CXX11_OVERRIDE;
        intptr_t get(const Extensible* container) const;
        intptr_t set(Extensible* container, intptr_t value);
        void unset(Extensible* container) { set(container, 0); }
-       void free(void* item);
+       void free(void* item) CXX11_OVERRIDE;
 };
 
 class CoreExport StringExtItem : public ExtensionItem
@@ -216,9 +225,9 @@ class CoreExport StringExtItem : public ExtensionItem
        StringExtItem(const std::string& key, ExtensibleType exttype, Module* owner);
        virtual ~StringExtItem();
        std::string* get(const Extensible* container) const;
-       std::string serialize(SerializeFormat format, const Extensible* container, void* item) const;
-       void unserialize(SerializeFormat format, Extensible* container, const std::string& value);
+       std::string serialize(SerializeFormat format, const Extensible* container, void* item) const CXX11_OVERRIDE;
+       void unserialize(SerializeFormat format, Extensible* container, const std::string& value) CXX11_OVERRIDE;
        void set(Extensible* container, const std::string& value);
        void unset(Extensible* container);
-       void free(void* item);
+       void free(void* item) CXX11_OVERRIDE;
 };