Be consistent. Use ServerInstance in all places instead of 'Instance' in half. This has bugged me forever :p. I think I got all of extra/ too..

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@10579 e03df62e-2008-0410-955e-edbf42e46eb7

1 files changed, 9 insertions, 9 deletions

diff --git a/src/modules/m_spanningtree/privmsg.cpp b/src/modules/m_spanningtree/privmsg.cpp
index a68590048..da3756309 100644
--- a/src/modules/m_spanningtree/privmsg.cpp
+++ b/src/modules/m_spanningtree/privmsg.cpp
@@ -32,49 +32,49 @@ bool TreeSocket::ServerMessage(const std::string &messagetype, const std::string
 		const char* target = params[0].c_str();
 		std::string text = params[1].c_str();
 
-		if (Instance->Modes->FindPrefix(*target))
+		if (ServerInstance->Modes->FindPrefix(*target))
 		{
 			status = *target;
 			target++;
 		}
 
-		Channel* channel = Instance->FindChan(target);
+		Channel* channel = ServerInstance->FindChan(target);
 
 		if (channel)
 		{
 			if (messagetype == "PRIVMSG")
 			{
-				FOREACH_MOD_I(Instance, I_OnUserMessage, OnUserMessage(NULL, channel, TYPE_CHANNEL, text, status, except_list));
+				FOREACH_MOD_I(ServerInstance, I_OnUserMessage, OnUserMessage(NULL, channel, TYPE_CHANNEL, text, status, except_list));
 			}
 			else
 			{
-				FOREACH_MOD_I(Instance, I_OnUserNotice, OnUserNotice(NULL, channel, TYPE_CHANNEL, text, status, except_list));
+				FOREACH_MOD_I(ServerInstance, I_OnUserNotice, OnUserNotice(NULL, channel, TYPE_CHANNEL, text, status, except_list));
 			}
 			TreeServer* s = Utils->FindServer(prefix);
 			if (s)
 			{
-				FOREACH_MOD_I(Instance, I_OnText, OnText(NULL, channel, TYPE_CHANNEL, text, status, except_list));
+				FOREACH_MOD_I(ServerInstance, I_OnText, OnText(NULL, channel, TYPE_CHANNEL, text, status, except_list));
 				channel->WriteChannelWithServ(s->GetName().c_str(), "%s %s :%s", messagetype.c_str(), channel->name.c_str(), text.c_str());
 			}
 		}
 		else
 		{
-			User* user = Instance->FindNick(target);
+			User* user = ServerInstance->FindNick(target);
 
 			if (user)
 			{
 				if (messagetype == "PRIVMSG")
 				{
-					FOREACH_MOD_I(Instance, I_OnUserMessage, OnUserMessage(NULL, user, TYPE_USER, text, 0, except_list));
+					FOREACH_MOD_I(ServerInstance, I_OnUserMessage, OnUserMessage(NULL, user, TYPE_USER, text, 0, except_list));
 				}
 				else
 				{
-					FOREACH_MOD_I(Instance, I_OnUserNotice, OnUserNotice(NULL, user, TYPE_USER, text, 0, except_list));
+					FOREACH_MOD_I(ServerInstance, I_OnUserNotice, OnUserNotice(NULL, user, TYPE_USER, text, 0, except_list));
 				}
 				TreeServer* s = Utils->FindServer(prefix);
 				if (s)
 				{
-					FOREACH_MOD_I(Instance, I_OnText, OnText(NULL, user, TYPE_USER, text, status, except_list));
+					FOREACH_MOD_I(ServerInstance, I_OnText, OnText(NULL, user, TYPE_USER, text, status, except_list));
 					user->Write(":%s %s %s :%s", s->GetName().c_str(), messagetype.c_str(), user->nick.c_str(), text.c_str());
 				}