Remove cull_list.h from inspircd.h

8 files changed, 12 insertions, 9 deletions

diff --git a/src/modules/extra/m_pgsql.cpp b/src/modules/extra/m_pgsql.cpp
index 0eb2cc8ae..ff5e57572 100644
--- a/src/modules/extra/m_pgsql.cpp
+++ b/src/modules/extra/m_pgsql.cpp
@@ -599,7 +599,7 @@ void SQLConn::DelayReconnect()
 	if (it != mod->connections.end())
 	{
 		mod->connections.erase(it);
-		ServerInstance->GlobalCulls.AddItem((EventHandler*)this);
+		ServerInstance->GlobalCulls->AddItem((EventHandler*)this);
 		if (!mod->retimer)
 		{
 			mod->retimer = new ReconnectTimer(mod);
diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp
index 9d1e73d71..7054f1f4d 100644
--- a/src/modules/m_httpd.cpp
+++ b/src/modules/m_httpd.cpp
@@ -12,6 +12,7 @@
  */
 
 #include "inspircd.h"
+#include "cull_list.h"
 #include "httpd.h"
 
 /* $ModDesc: Provides HTTP serving facilities to modules */
@@ -76,7 +77,7 @@ class HttpServerSocket : public BufferedSocket
 
 	virtual void OnError(BufferedSocketError)
 	{
-		ServerInstance->GlobalCulls.AddItem(this);
+		ServerInstance->GlobalCulls->AddItem(this);
 	}
 
 	std::string Response(int response)
diff --git a/src/modules/m_serverbots.cpp b/src/modules/m_serverbots.cpp
index 0909f8a60..7e8565287 100644
--- a/src/modules/m_serverbots.cpp
+++ b/src/modules/m_serverbots.cpp
@@ -12,6 +12,7 @@
  */
 
 #include "inspircd.h"
+#include "cull_list.h"
 
 /* $ModDesc: Provides fake clients that respond to messages. */
 
@@ -215,7 +216,7 @@ class BotTracker : public SimpleExtItem<BotData>
 		if (!ext)
 			return;
 		bots.erase(ext->bot->nick);
-		ServerInstance->GlobalCulls.AddItem(ext->bot);
+		ServerInstance->GlobalCulls->AddItem(ext->bot);
 		delete ext;
 	}
 };
@@ -315,7 +316,7 @@ class ModuleServerBots : public Module
 		}
 		for(std::map<std::string, BotData*>::iterator i = oldbots.begin(); i != oldbots.end(); i++)
 		{
-			ServerInstance->GlobalCulls.AddItem(i->second->bot);
+			ServerInstance->GlobalCulls->AddItem(i->second->bot);
 		}
 
 		tags = ServerInstance->Config->GetTags("botcmd");
diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index 814ff75a9..40e8d4894 100644
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -216,7 +216,7 @@ void ModuleSpanningTree::ConnectServer(Link* x, Autoconnect* y)
 		{
 			ServerInstance->SNO->WriteToSnoMask('l', "CONNECT: Error connecting \002%s\002: %s.",
 				x->Name.c_str(), newsocket->getError().c_str());
-			ServerInstance->GlobalCulls.AddItem(newsocket);
+			ServerInstance->GlobalCulls->AddItem(newsocket);
 		}
 	}
 	else
diff --git a/src/modules/m_spanningtree/resolvers.cpp b/src/modules/m_spanningtree/resolvers.cpp
index 5813ed935..6027228b7 100644
--- a/src/modules/m_spanningtree/resolvers.cpp
+++ b/src/modules/m_spanningtree/resolvers.cpp
@@ -54,7 +54,7 @@ void ServernameResolver::OnLookupComplete(const std::string &result, unsigned in
 			/* Something barfed, show the opers */
 			ServerInstance->SNO->WriteToSnoMask('l', "CONNECT: Error connecting \002%s\002: %s.",
 				MyLink->Name.c_str(), newsocket->getError().c_str());
-			ServerInstance->GlobalCulls.AddItem(newsocket);
+			ServerInstance->GlobalCulls->AddItem(newsocket);
 		}
 	}
 }
diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp
index a3ace24d1..238619f90 100644
--- a/src/modules/m_spanningtree/treesocket1.cpp
+++ b/src/modules/m_spanningtree/treesocket1.cpp
@@ -122,7 +122,7 @@ void TreeSocket::OnError(BufferedSocketError e)
 {
 	if (LinkState != DYING)
 	{
-		ServerInstance->GlobalCulls.AddItem(this);
+		ServerInstance->GlobalCulls->AddItem(this);
 		ServerInstance->SNO->WriteGlobalSno('l', "Connection to \002%s\002 failed with error: %s",
 			linkID.c_str(), getError().c_str());
 		LinkState = DYING;
@@ -135,7 +135,7 @@ void TreeSocket::SendError(const std::string &errormessage)
 	DoWrite();
 	if (LinkState != DYING)
 	{
-		ServerInstance->GlobalCulls.AddItem(this);
+		ServerInstance->GlobalCulls->AddItem(this);
 		LinkState = DYING;
 	}
 	SetError(errormessage);
diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp
index f0eaed5ed..28c9baeed 100644
--- a/src/modules/m_spanningtree/treesocket2.cpp
+++ b/src/modules/m_spanningtree/treesocket2.cpp
@@ -446,7 +446,7 @@ void TreeSocket::OnTimeout()
 void TreeSocket::Close()
 {
 	if (fd != -1)
-		ServerInstance->GlobalCulls.AddItem(this);
+		ServerInstance->GlobalCulls->AddItem(this);
 	this->BufferedSocket::Close();
 	SetError("Remote host closed connection");
 
diff --git a/src/modules/m_spanningtree/utils.h b/src/modules/m_spanningtree/utils.h
index 54e0335c6..b5424ebc8 100644
--- a/src/modules/m_spanningtree/utils.h
+++ b/src/modules/m_spanningtree/utils.h
@@ -15,6 +15,7 @@
 #define __ST__UTIL__
 
 #include "inspircd.h"
+#include "cull_list.h"
 #include "protocol.h"
 
 /* Foward declarations */