Change the syntax of FOREACH macros to be less dumb.

5 files changed, 10 insertions, 10 deletions

diff --git a/src/modules/m_spanningtree/away.cpp b/src/modules/m_spanningtree/away.cpp
index f2cabadd5..ae60633bf 100644
--- a/src/modules/m_spanningtree/away.cpp
+++ b/src/modules/m_spanningtree/away.cpp
@@ -30,7 +30,7 @@ bool TreeSocket::Away(const std::string &prefix, parameterlist &params)
 		return true;
 	if (params.size())
 	{
-		FOREACH_MOD(I_OnSetAway, OnSetAway(u, params[params.size() - 1]));
+		FOREACH_MOD(OnSetAway, (u, params[params.size() - 1]));
 
 		if (params.size() > 1)
 			u->awaytime = ConvToInt(params[0]);
@@ -43,7 +43,7 @@ bool TreeSocket::Away(const std::string &prefix, parameterlist &params)
 	}
 	else
 	{
-		FOREACH_MOD(I_OnSetAway, OnSetAway(u, ""));
+		FOREACH_MOD(OnSetAway, (u, ""));
 		u->awaymsg.clear();
 	}
 	Utils->DoOneToAllButSender(prefix,"AWAY",params,u->server);
diff --git a/src/modules/m_spanningtree/metadata.cpp b/src/modules/m_spanningtree/metadata.cpp
index 9709ca54c..8ce41d87f 100644
--- a/src/modules/m_spanningtree/metadata.cpp
+++ b/src/modules/m_spanningtree/metadata.cpp
@@ -26,7 +26,7 @@ CmdResult CommandMetadata::Handle(const std::vector<std::string>& params, User *
 	if (params[0] == "*")
 	{
 		std::string value = params.size() < 3 ? "" : params[2];
-		FOREACH_MOD(I_OnDecodeMetaData,OnDecodeMetaData(NULL,params[1],value));
+		FOREACH_MOD(OnDecodeMetaData, (NULL,params[1],value));
 		return CMD_SUCCESS;
 	}
 
@@ -54,7 +54,7 @@ CmdResult CommandMetadata::Handle(const std::vector<std::string>& params, User *
 		ExtensionItem* item = ServerInstance->Extensions.GetItem(params[2]);
 		if (item)
 			item->unserialize(FORMAT_NETWORK, c, value);
-		FOREACH_MOD(I_OnDecodeMetaData,OnDecodeMetaData(c,params[2],value));
+		FOREACH_MOD(OnDecodeMetaData, (c,params[2],value));
 	}
 	else
 	{
@@ -66,7 +66,7 @@ CmdResult CommandMetadata::Handle(const std::vector<std::string>& params, User *
 
 			if (item)
 				item->unserialize(FORMAT_NETWORK, u, value);
-			FOREACH_MOD(I_OnDecodeMetaData,OnDecodeMetaData(u,params[1],value));
+			FOREACH_MOD(OnDecodeMetaData, (u,params[1],value));
 		}
 	}
 
diff --git a/src/modules/m_spanningtree/netburst.cpp b/src/modules/m_spanningtree/netburst.cpp
index aefb9de01..d86115cce 100644
--- a/src/modules/m_spanningtree/netburst.cpp
+++ b/src/modules/m_spanningtree/netburst.cpp
@@ -51,7 +51,7 @@ void TreeSocket::DoBurst(TreeServer* s)
 		SyncChannel(i->second);
 
 	this->SendXLines();
-	FOREACH_MOD(I_OnSyncNetwork,OnSyncNetwork(Utils->Creator,(void*)this));
+	FOREACH_MOD(OnSyncNetwork, (Utils->Creator,(void*)this));
 	this->WriteLine(":" + ServerInstance->Config->GetSID() + " ENDBURST");
 	ServerInstance->SNO->WriteToSnoMask('l',"Finished bursting to \2"+ s->GetName()+"\2.");
 }
@@ -167,7 +167,7 @@ void TreeSocket::SyncChannel(Channel* chan)
 			Utils->Creator->ProtoSendMetaData(this, chan, item->name, value);
 	}
 
-	FOREACH_MOD(I_OnSyncChannel,OnSyncChannel(chan, Utils->Creator, this));
+	FOREACH_MOD(OnSyncChannel, (chan, Utils->Creator, this));
 }
 
 /** send all users and their oper state/modes */
@@ -212,7 +212,7 @@ void TreeSocket::SendUsers()
 					Utils->Creator->ProtoSendMetaData(this, u->second, item->name, value);
 			}
 
-			FOREACH_MOD(I_OnSyncUser,OnSyncUser(u->second,Utils->Creator,this));
+			FOREACH_MOD(OnSyncUser, (u->second,Utils->Creator,this));
 		}
 	}
 }
diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp
index 69dfa3ce3..1c72f3ad7 100644
--- a/src/modules/m_spanningtree/treesocket1.cpp
+++ b/src/modules/m_spanningtree/treesocket1.cpp
@@ -69,7 +69,7 @@ TreeSocket::TreeSocket(SpanningTreeUtilities* Util, int newfd, ListenSocket* via
 	capab = new CapabData;
 	capab->capab_phase = 0;
 
-	FOREACH_MOD(I_OnHookIO, OnHookIO(this, via));
+	FOREACH_MOD(OnHookIO, (this, via));
 	if (GetIOHook())
 		GetIOHook()->OnStreamSocketAccept(this, client, server);
 	SendCapabilities(1);
diff --git a/src/modules/m_spanningtree/uid.cpp b/src/modules/m_spanningtree/uid.cpp
index 4204737ca..dd4591a9b 100644
--- a/src/modules/m_spanningtree/uid.cpp
+++ b/src/modules/m_spanningtree/uid.cpp
@@ -148,7 +148,7 @@ CmdResult CommandUID::Handle(const parameterlist &params, User* serversrc)
 	if (dosend)
 		ServerInstance->SNO->WriteToSnoMask('C',"Client connecting at %s: %s (%s) [%s]", _new->server.c_str(), _new->GetFullRealHost().c_str(), _new->GetIPString().c_str(), _new->fullname.c_str());
 
-	FOREACH_MOD(I_OnPostConnect,OnPostConnect(_new));
+	FOREACH_MOD(OnPostConnect, (_new));
 
 	return CMD_SUCCESS;
 }