X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fextensible.h;h=1da45cee632ff4ff63bd104db927c6e603112e55;hb=60d92db9a1b71bbfd4230c5eb9f04cd6a87a41d8;hp=11d6acbc9359deb9dbfe455fd32f094ee531595d;hpb=b4f82cff9b2efdc05e29bfe9db3f0bbb40d9ce2b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/extensible.h b/include/extensible.h
index 11d6acbc9..1da45cee6 100644
--- 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();
+	virtual CullResult cull() CXX11_OVERRIDE;
 	virtual ~Extensible();
 	void doUnhookExtensions(const std::vector<reference<ExtensionItem> >& toRemove);
 
@@ -201,6 +203,7 @@ class CoreExport LocalStringExt : public SimpleExtItem<std::string>
 	LocalStringExt(const std::string& key, ExtensibleType exttype, Module* owner);
 	virtual ~LocalStringExt();
 	std::string serialize(SerializeFormat format, const Extensible* container, void* item) const;
+	void unserialize(SerializeFormat format, Extensible* container, const std::string& value);
 };
 
 class CoreExport LocalIntExt : public LocalExtItem
@@ -209,6 +212,7 @@ class CoreExport LocalIntExt : public LocalExtItem
 	LocalIntExt(const std::string& key, ExtensibleType exttype, Module* owner);
 	virtual ~LocalIntExt();
 	std::string serialize(SerializeFormat format, const Extensible* container, void* item) const;
+	void unserialize(SerializeFormat format, Extensible* container, const std::string& value);
 	intptr_t get(const Extensible* container) const;
 	intptr_t set(Extensible* container, intptr_t value);
 	void unset(Extensible* container) { set(container, 0); }