Merge remote/local MODULES output

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / metadata.cpp

diff --git a/src/modules/m_spanningtree/metadata.cpp b/src/modules/m_spanningtree/metadata.cpp
index 40a98d93b2fa2b16905baaa6f5bf6281bc4101e6..ee26f0c73109f73315c4387b2d807df24570398a 100644 (file)
--- a/src/modules/m_spanningtree/metadata.cpp
+++ b/src/modules/m_spanningtree/metadata.cpp
@@ -33,26 +33,26 @@ bool TreeSocket::MetaData(const std::string &prefix, parameterlist &params)
        {
                if (params[0] == "*")
                {
-                       FOREACH_MOD_I(this->ServerInstance,I_OnDecodeMetaData,OnDecodeMetaData(NULL,params[1],params[2]));
+                       FOREACH_MOD(I_OnDecodeMetaData,OnDecodeMetaData(NULL,params[1],params[2]));
                }
                else if (*(params[0].c_str()) == '#')
                {
-                       Channel* c = this->ServerInstance->FindChan(params[0]);
+                       Channel* c = ServerInstance->FindChan(params[0]);
                        if (c)
                        {
                                if (item)
                                        item->unserialize(FORMAT_NETWORK, c, params[2]);
-                               FOREACH_MOD_I(this->ServerInstance,I_OnDecodeMetaData,OnDecodeMetaData(c,params[1],params[2]));
+                               FOREACH_MOD(I_OnDecodeMetaData,OnDecodeMetaData(c,params[1],params[2]));
                        }
                }
                else if (*(params[0].c_str()) != '#')
                {
-                       User* u = this->ServerInstance->FindNick(params[0]);
+                       User* u = ServerInstance->FindNick(params[0]);
                        if (u)
                        {
                                if (item)
                                        item->unserialize(FORMAT_NETWORK, u, params[2]);
-                               FOREACH_MOD_I(this->ServerInstance,I_OnDecodeMetaData,OnDecodeMetaData(u,params[1],params[2]));
+                               FOREACH_MOD(I_OnDecodeMetaData,OnDecodeMetaData(u,params[1],params[2]));
                        }
                }
        }