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, 12 insertions, 12 deletions

diff --git a/src/modules/m_spanningtree/addline.cpp b/src/modules/m_spanningtree/addline.cpp
index dde9f45d3..08f885797 100644
--- a/src/modules/m_spanningtree/addline.cpp
+++ b/src/modules/m_spanningtree/addline.cpp
@@ -24,14 +24,14 @@ bool TreeSocket::AddLine(const std::string &prefix, std::deque<std::string> &par
 {
 	if (params.size() < 6)
 	{
-		this->Instance->SNO->WriteToSnoMask('x',"%s sent me a malformed ADDLINE of type %s.",prefix.c_str(),params[0].c_str());
+		this->ServerInstance->SNO->WriteToSnoMask('x',"%s sent me a malformed ADDLINE of type %s.",prefix.c_str(),params[0].c_str());
 		return true;
 	}
 
-	XLineFactory* xlf = Instance->XLines->GetFactory(params[0]);
+	XLineFactory* xlf = ServerInstance->XLines->GetFactory(params[0]);
 
 	std::string setter = "<unknown>";
-	User* usr = Instance->FindNick(prefix);
+	User* usr = ServerInstance->FindNick(prefix);
 	if (usr)
 		setter = usr->nick;
 	else
@@ -43,42 +43,42 @@ bool TreeSocket::AddLine(const std::string &prefix, std::deque<std::string> &par
 
 	if (!xlf)
 	{
-		this->Instance->SNO->WriteToSnoMask('x',"%s sent me an unknown ADDLINE type (%s).",setter.c_str(),params[0].c_str());
+		this->ServerInstance->SNO->WriteToSnoMask('x',"%s sent me an unknown ADDLINE type (%s).",setter.c_str(),params[0].c_str());
 		return true;
 	}
 
 	XLine* xl = NULL;
 	try
 	{
-		xl = xlf->Generate(Instance->Time(), atoi(params[4].c_str()), params[2].c_str(), params[5].c_str(), params[1].c_str());
+		xl = xlf->Generate(ServerInstance->Time(), atoi(params[4].c_str()), params[2].c_str(), params[5].c_str(), params[1].c_str());
 	}
 	catch (ModuleException &e)
 	{
-		this->Instance->SNO->WriteToSnoMask('x',"Unable to ADDLINE type %s from %s: %s", params[0].c_str(), setter.c_str(), e.GetReason());
+		this->ServerInstance->SNO->WriteToSnoMask('x',"Unable to ADDLINE type %s from %s: %s", params[0].c_str(), setter.c_str(), e.GetReason());
 		return true;
 	}
 	xl->SetCreateTime(atoi(params[3].c_str()));
-	if (Instance->XLines->AddLine(xl,NULL))
+	if (ServerInstance->XLines->AddLine(xl,NULL))
 	{
 		if (xl->duration)
 		{
-			this->Instance->SNO->WriteToSnoMask('x',"%s added %s%s on %s to expire on %s (%s).",setter.c_str(),params[0].c_str(),params[0].length() == 1 ? "LINE" : "",
-					params[1].c_str(),Instance->TimeString(xl->expiry).c_str(),params[5].c_str());
+			this->ServerInstance->SNO->WriteToSnoMask('x',"%s added %s%s on %s to expire on %s (%s).",setter.c_str(),params[0].c_str(),params[0].length() == 1 ? "LINE" : "",
+					params[1].c_str(),ServerInstance->TimeString(xl->expiry).c_str(),params[5].c_str());
 		}
 		else
 		{
-			this->Instance->SNO->WriteToSnoMask('x',"%s added permanent %s%s on %s (%s).",setter.c_str(),params[0].c_str(),params[0].length() == 1 ? "LINE" : "",
+			this->ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent %s%s on %s (%s).",setter.c_str(),params[0].c_str(),params[0].length() == 1 ? "LINE" : "",
 					params[1].c_str(),params[5].c_str());
 		}
 		params[5] = ":" + params[5];
 
-		User* u = Instance->FindNick(prefix);
+		User* u = ServerInstance->FindNick(prefix);
 		Utils->DoOneToAllButSender(prefix, "ADDLINE", params, u ? u->server : prefix);
 		TreeServer *remoteserver = Utils->FindServer(u ? u->server : prefix);
 
 		if (!remoteserver->bursting)
 		{
-			Instance->XLines->ApplyLines();
+			ServerInstance->XLines->ApplyLines();
 		}
 	}
 	else