Merge branch 'insp3' into master.

1 files changed, 3 insertions, 10 deletions

diff --git a/src/modules/m_monitor.cpp b/src/modules/m_monitor.cpp
index 809a7fb24..88fcc906c 100644
--- a/src/modules/m_monitor.cpp
+++ b/src/modules/m_monitor.cpp
@@ -82,12 +82,9 @@ class IRCv3::Monitor::Manager
 			free(container, unset_raw(container));
 		}
 
-		std::string serialize(SerializeFormat format, const Extensible* container, void* item) const override
+		std::string ToInternal(const Extensible* container, void* item) const override
 		{
 			std::string ret;
-			if (format == FORMAT_NETWORK)
-				return ret;
-
 			const ExtData* extdata = static_cast<ExtData*>(item);
 			for (WatchedList::const_iterator i = extdata->list.begin(); i != extdata->list.end(); ++i)
 			{
@@ -99,7 +96,7 @@ class IRCv3::Monitor::Manager
 			return ret;
 		}
 
-		void unserialize(SerializeFormat format, Extensible* container, const std::string& value) override;
+		void FromInternal(Extensible* container, const std::string& value) override;
 
 		void free(Extensible* container, void* item) override
 		{
@@ -245,12 +242,8 @@ class IRCv3::Monitor::Manager
  	WatchedList emptywatchedlist;
 };
 
-// inline is needed in static builds to support m_watch including the Manager code from this file
-inline void IRCv3::Monitor::Manager::ExtItem::unserialize(SerializeFormat format, Extensible* container, const std::string& value)
+void IRCv3::Monitor::Manager::ExtItem::FromInternal(Extensible* container, const std::string& value)
 {
-	if (format == FORMAT_NETWORK)
-		return;
-
 	irc::spacesepstream ss(value);
 	for (std::string nick; ss.GetToken(nick); )
 		manager.Watch(static_cast<LocalUser*>(container), nick, UINT_MAX);