Move serialization from Serializable to a Serialize::Type child.

1 files changed, 20 insertions, 6 deletions

diff --git a/include/account.h b/include/account.h
index 5c2e52fd2..02e71ac38 100644
--- a/include/account.h
+++ b/include/account.h
@@ -32,6 +32,16 @@ class CoreExport NickAlias final
 	: public Serializable
 	, public Extensible
 {
+public:
+	struct Type final
+		: public Serialize::Type
+	{
+		Type();
+		void Serialize(const Serializable *obj, Serialize::Data &data) const override;
+		Serializable *Unserialize(Serializable *obj, Serialize::Data &data) const override;
+	};
+
+private:
 	Anope::string vhost_ident, vhost_host, vhost_creator;
 	time_t vhost_created = 0;
 
@@ -56,9 +66,6 @@ public:
 	NickAlias(const Anope::string &nickname, NickCore *nickcore);
 	~NickAlias();
 
-	void Serialize(Serialize::Data &data) const override;
-	static Serializable *Unserialize(Serializable *obj, Serialize::Data &);
-
 	/** Set a vhost for the user
 	 * @param ident The ident
 	 * @param host The host
@@ -116,6 +123,16 @@ class CoreExport NickCore final
 	: public Serializable
 	, public Extensible
 {
+public:
+	struct Type final
+		: public Serialize::Type
+	{
+		Type();
+		void Serialize(const Serializable *obj, Serialize::Data &data) const override;
+		Serializable *Unserialize(Serializable *obj, Serialize::Data &data) const override;
+	};
+
+private:
 	/* Channels which reference this core in some way (this is on their access list, akick list, is founder, successor, etc) */
 	Serialize::Checker<std::map<ChannelInfo *, int> > chanaccess;
 	/* Unique identifier for the account. */
@@ -159,9 +176,6 @@ public:
 	NickCore(const Anope::string &nickdisplay, uint64_t nickid = 0);
 	~NickCore();
 
-	void Serialize(Serialize::Data &data) const override;
-	static Serializable *Unserialize(Serializable *obj, Serialize::Data &);
-
 	/** Changes the display for this account
 	 * @param na The new display, must be grouped to this account.
 	 */