Refactor classbase/CullResult into Cullable/Cullable::Result.

8 files changed, 18 insertions, 19 deletions

diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index 2a3933a46..19109ea35 100644
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -802,11 +802,11 @@ void ModuleSpanningTree::OnShutdown(const std::string& reason)
 		children.front()->SQuit(reason, true);
 }
 
-CullResult ModuleSpanningTree::cull()
+Cullable::Result ModuleSpanningTree::Cull()
 {
 	if (Utils)
-		Utils->cull();
-	return this->Module::cull();
+		Utils->Cull();
+	return Module::Cull();
 }
 
 ModuleSpanningTree::~ModuleSpanningTree()
diff --git a/src/modules/m_spanningtree/main.h b/src/modules/m_spanningtree/main.h
index 9a582bf49..85361e5a7 100644
--- a/src/modules/m_spanningtree/main.h
+++ b/src/modules/m_spanningtree/main.h
@@ -216,7 +216,7 @@ class ModuleSpanningTree
 	ModResult OnAcceptConnection(int newsock, ListenSocket* from, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) override;
 	void OnMode(User* source, User* u, Channel* c, const Modes::ChangeList& modes, ModeParser::ModeProcessFlag processflags) override;
 	void OnShutdown(const std::string& reason) override;
-	CullResult cull() override;
+	Cullable::Result Cull() override;
 	~ModuleSpanningTree();
 	void Prioritize() override;
 };
diff --git a/src/modules/m_spanningtree/treeserver.cpp b/src/modules/m_spanningtree/treeserver.cpp
index ca9773fde..1d64826e6 100644
--- a/src/modules/m_spanningtree/treeserver.cpp
+++ b/src/modules/m_spanningtree/treeserver.cpp
@@ -197,7 +197,7 @@ void TreeServer::SQuitChild(TreeServer* server, const std::string& reason, bool
 	if (server->IsLocal())
 		server->GetSocket()->Close();
 
-	// Add the server to the cull list, the servers behind it are handled by cull() and the destructor
+	// Add the server to the cull list, the servers behind it are handled by Cull() and the destructor
 	ServerInstance->GlobalCulls.AddItem(server);
 }
 
@@ -270,18 +270,18 @@ void TreeServer::AddHashEntry()
 	Utils->sidlist[GetId()] = this;
 }
 
-CullResult TreeServer::cull()
+Cullable::Result TreeServer::Cull()
 {
 	// Recursively cull all servers that are under us in the tree
 	for (ChildServers::const_iterator i = Children.begin(); i != Children.end(); ++i)
 	{
 		TreeServer* server = *i;
-		server->cull();
+		server->Cull();
 	}
 
 	if (!IsRoot())
-		ServerUser->cull();
-	return classbase::cull();
+		ServerUser->Cull();
+	return Cullable::Cull();
 }
 
 TreeServer::~TreeServer()
diff --git a/src/modules/m_spanningtree/treeserver.h b/src/modules/m_spanningtree/treeserver.h
index 7a14b2373..028bbf49d 100644
--- a/src/modules/m_spanningtree/treeserver.h
+++ b/src/modules/m_spanningtree/treeserver.h
@@ -230,7 +230,7 @@ class TreeServer : public Server
 	 */
 	void OnPong() { pingtimer.OnPong(); }
 
-	CullResult cull() override;
+	Cullable::Result Cull() override;
 
 	/** Destructor, deletes ServerUser unless IsRoot()
 	 */
diff --git a/src/modules/m_spanningtree/treesocket.h b/src/modules/m_spanningtree/treesocket.h
index 906602d39..f496eb069 100644
--- a/src/modules/m_spanningtree/treesocket.h
+++ b/src/modules/m_spanningtree/treesocket.h
@@ -220,7 +220,7 @@ class TreeSocket : public BufferedSocket
 	 */
 	void CleanNegotiationInfo();
 
-	CullResult cull() override;
+	Cullable::Result Cull() override;
 
 	/** Construct a password, optionally hashed with the other side's
 	 * challenge string
diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp
index 6448f7f8b..bb9ef96b8 100644
--- a/src/modules/m_spanningtree/treesocket1.cpp
+++ b/src/modules/m_spanningtree/treesocket1.cpp
@@ -110,12 +110,12 @@ void TreeSocket::CleanNegotiationInfo()
 	capab.reset();
 }
 
-CullResult TreeSocket::cull()
+Cullable::Result TreeSocket::Cull()
 {
 	Utils->timeoutlist.erase(this);
 	if (capab && capab->ac)
 		Utils->Creator->ConnectServer(capab->ac, false);
-	return this->BufferedSocket::cull();
+	return this->BufferedSocket::Cull();
 }
 
 /** When an outbound connection finishes connecting, we receive
diff --git a/src/modules/m_spanningtree/utils.cpp b/src/modules/m_spanningtree/utils.cpp
index 41451cc05..3f16bfebe 100644
--- a/src/modules/m_spanningtree/utils.cpp
+++ b/src/modules/m_spanningtree/utils.cpp
@@ -112,7 +112,7 @@ SpanningTreeUtilities::SpanningTreeUtilities(ModuleSpanningTree* C)
 	ServerInstance->Timers.AddTimer(&RefreshTimer);
 }
 
-CullResult SpanningTreeUtilities::cull()
+Cullable::Result SpanningTreeUtilities::Cull()
 {
 	const TreeServer::ChildServers& children = TreeRoot->GetChildren();
 	while (!children.empty())
@@ -126,9 +126,9 @@ CullResult SpanningTreeUtilities::cull()
 		TreeSocket* s = i->first;
 		s->Close();
 	}
-	TreeRoot->cull();
+	TreeRoot->Cull();
 
-	return classbase::cull();
+	return Cullable::Cull();
 }
 
 SpanningTreeUtilities::~SpanningTreeUtilities()
diff --git a/src/modules/m_spanningtree/utils.h b/src/modules/m_spanningtree/utils.h
index 7bf9c4be1..2782330d5 100644
--- a/src/modules/m_spanningtree/utils.h
+++ b/src/modules/m_spanningtree/utils.h
@@ -45,7 +45,7 @@ typedef std::unordered_map<std::string, TreeServer*, irc::insensitive, irc::StrH
 /** Contains helper functions and variables for this module,
  * and keeps them out of the global namespace
  */
-class SpanningTreeUtilities : public classbase
+class SpanningTreeUtilities : public Cullable
 {
 	CacheRefreshTimer RefreshTimer;
 
@@ -112,7 +112,6 @@ class SpanningTreeUtilities : public classbase
 	 * valgrind warning in TimerManager on unload
 	 */
 	unsigned int PingFreq = 60;
-	
 
 	/** Initialise utility class
 	 */
@@ -120,7 +119,7 @@ class SpanningTreeUtilities : public classbase
 
 	/** Prepare for class destruction
 	 */
-	CullResult cull() override;
+	Cullable::Result Cull() override;
 
 	/** Destroy class and free listeners etc
 	 */