Make classbase and refcountbase uncopyable; expand comments on their indended uses

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

6 files changed, 9 insertions, 9 deletions

diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index afd40e0c9..e46c2d320 100644
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -944,7 +944,7 @@ void ModuleSpanningTree::ProtoSendMetaData(void* opaque, Extensible* target, con
 		s->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" METADATA * "+extname+" :"+extdata);
 }
 
-bool ModuleSpanningTree::cull()
+CullResult ModuleSpanningTree::cull()
 {
 	Utils->cull();
 	ServerInstance->Timers->DelTimer(RefreshTimer);
diff --git a/src/modules/m_spanningtree/main.h b/src/modules/m_spanningtree/main.h
index be9c460d9..692442598 100644
--- a/src/modules/m_spanningtree/main.h
+++ b/src/modules/m_spanningtree/main.h
@@ -190,7 +190,7 @@ class ModuleSpanningTree : public Module
 	void ProtoSendMetaData(void* opaque, Extensible* target, const std::string &extname, const std::string &extdata);
 	void OnLoadModule(Module* mod);
 	void OnUnloadModule(Module* mod);
-	bool cull();
+	CullResult cull();
 	~ModuleSpanningTree();
 	Version GetVersion();
 	void Prioritize();
diff --git a/src/modules/m_spanningtree/treesocket.h b/src/modules/m_spanningtree/treesocket.h
index a0f0e5d88..b5f97c30f 100644
--- a/src/modules/m_spanningtree/treesocket.h
+++ b/src/modules/m_spanningtree/treesocket.h
@@ -133,7 +133,7 @@ class TreeSocket : public BufferedSocket
 	 */
 	void CleanNegotiationInfo();
 
-	bool cull();
+	CullResult cull();
 	/** Destructor
 	 */
 	~TreeSocket();
diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp
index d99d8d6c9..f6f237529 100644
--- a/src/modules/m_spanningtree/treesocket1.cpp
+++ b/src/modules/m_spanningtree/treesocket1.cpp
@@ -103,7 +103,7 @@ void TreeSocket::CleanNegotiationInfo()
 	OutboundPass.clear();
 }
 
-bool TreeSocket::cull()
+CullResult TreeSocket::cull()
 {
 	Utils->timeoutlist.erase(this);
 	if (myautoconnect)
diff --git a/src/modules/m_spanningtree/utils.cpp b/src/modules/m_spanningtree/utils.cpp
index 09333fdd2..024605a79 100644
--- a/src/modules/m_spanningtree/utils.cpp
+++ b/src/modules/m_spanningtree/utils.cpp
@@ -151,7 +151,7 @@ SpanningTreeUtilities::SpanningTreeUtilities(ModuleSpanningTree* C) : Creator(C)
 	this->ReadConfiguration(true);
 }
 
-bool SpanningTreeUtilities::cull()
+CullResult SpanningTreeUtilities::cull()
 {
 	for (unsigned int i = 0; i < ServerInstance->ports.size(); i++)
 	{
@@ -171,9 +171,9 @@ bool SpanningTreeUtilities::cull()
 	}
 
 	ServerUser->uuid = TreeRoot->GetID();
-	if (ServerUser->cull())
-		delete ServerUser;
-	return true;
+	ServerUser->cull();
+	delete ServerUser;
+	return classbase::cull();
 }
 
 SpanningTreeUtilities::~SpanningTreeUtilities()
diff --git a/src/modules/m_spanningtree/utils.h b/src/modules/m_spanningtree/utils.h
index 48677e57d..2fc7304af 100644
--- a/src/modules/m_spanningtree/utils.h
+++ b/src/modules/m_spanningtree/utils.h
@@ -133,7 +133,7 @@ class SpanningTreeUtilities : public classbase
 
 	/** Prepare for class destruction
 	 */
-	bool cull();
+	CullResult cull();
 
 	/** Destroy class and free listeners etc
 	 */