Convert the spanningtree events to use the new cross-module event system

3 files changed, 10 insertions, 2 deletions

diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index 31d822789..e5e6e522b 100644
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -39,6 +39,7 @@ ModuleSpanningTree::ModuleSpanningTree()
 	: rconnect(this), rsquit(this), map(this)
 	, commands(NULL)
 	, currmembid(0)
+	, eventprov(this, "event/spanningtree")
 	, DNS(this, "DNS")
 	, loopCall(false)
 {
diff --git a/src/modules/m_spanningtree/main.h b/src/modules/m_spanningtree/main.h
index 13c743f73..9fde32cad 100644
--- a/src/modules/m_spanningtree/main.h
+++ b/src/modules/m_spanningtree/main.h
@@ -24,6 +24,7 @@
 #pragma once
 
 #include "inspircd.h"
+#include "event.h"
 #include "modules/dns.h"
 #include "servercommand.h"
 #include "commands.h"
@@ -72,6 +73,10 @@ class ModuleSpanningTree : public Module
 	 */
 	SpanningTreeProtocolInterface protocolinterface;
 
+	/** Event provider for our events
+	 */
+	Events::ModuleEventProvider eventprov;
+
  public:
 	dynamic_reference<DNS::Manager> DNS;
 
@@ -135,6 +140,8 @@ class ModuleSpanningTree : public Module
 	 */
 	static std::string TimeToStr(time_t secs);
 
+	const Events::ModuleEventProvider& GetEventProvider() const { return eventprov; }
+
 	/**
 	 ** *** MODULE EVENTS ***
 	 **/
diff --git a/src/modules/m_spanningtree/treeserver.cpp b/src/modules/m_spanningtree/treeserver.cpp
index e004f897e..6ebce07f9 100644
--- a/src/modules/m_spanningtree/treeserver.cpp
+++ b/src/modules/m_spanningtree/treeserver.cpp
@@ -151,7 +151,7 @@ void TreeServer::FinishBurst()
 	unsigned long bursttime = ts - this->StartBurst;
 	ServerInstance->SNO->WriteToSnoMask(Parent == Utils->TreeRoot ? 'l' : 'L', "Received end of netburst from \2%s\2 (burst time: %lu %s)",
 		GetName().c_str(), (bursttime > 10000 ? bursttime / 1000 : bursttime), (bursttime > 10000 ? "secs" : "msecs"));
-	AddServerEvent(Utils->Creator, GetName());
+	FOREACH_MOD_CUSTOM(Utils->Creator->GetEventProvider(), SpanningTreeEventListener, OnServerLink, (GetName()));
 
 	StartBurst = 0;
 	FinishBurstInternal();
@@ -159,7 +159,7 @@ void TreeServer::FinishBurst()
 
 void TreeServer::SQuitChild(TreeServer* server, const std::string& reason)
 {
-	DelServerEvent(Utils->Creator, server->GetName());
+	FOREACH_MOD_CUSTOM(Utils->Creator->GetEventProvider(), SpanningTreeEventListener, OnServerSplit, (server->GetName()));
 	stdalgo::erase(Children, server);
 
 	if (IsRoot())