From e6e3ae88fb26287fa9691110a80aec3aac8e9056 Mon Sep 17 00:00:00 2001
From: attilamolnar <attilamolnar@hush.com>
Date: Sun, 8 Sep 2013 16:57:03 +0200
Subject: Remove ModuleManager::ModCount and GetCount()

---
 include/modules.h          | 12 ------------
 src/modmanager_dynamic.cpp |  3 ---
 src/modules.cpp            |  3 +--
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/include/modules.h b/include/modules.h
index 118d9ea1c..f3f40d458 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -1173,10 +1173,6 @@ class CoreExport ModuleManager
 	 */
 	std::string LastModuleError;
 
-	/** Total number of modules loaded into the ircd
-	 */
-	int ModCount;
-
 	/** List of loaded modules and shared object/dll handles
 	 * keyed by module name
 	 */
@@ -1310,14 +1306,6 @@ class CoreExport ModuleManager
 	void UnloadAll();
 	void DoSafeUnload(Module*);
 
-	/** Get the total number of currently loaded modules
-	 * @return The number of loaded modules
-	 */
-	int GetCount()
-	{
-		return this->ModCount;
-	}
-
 	/** Find a module by name, and return a Module* to it.
 	 * This is preferred over iterating the module lists yourself.
 	 * @param name The module name to look up
diff --git a/src/modmanager_dynamic.cpp b/src/modmanager_dynamic.cpp
index 64d2bf69c..de9673996 100644
--- a/src/modmanager_dynamic.cpp
+++ b/src/modmanager_dynamic.cpp
@@ -108,7 +108,6 @@ bool ModuleManager::Load(const std::string& filename, bool defer)
 		return false;
 	}
 
-	this->ModCount++;
 	if (defer)
 		return true;
 
@@ -188,8 +187,6 @@ void ModuleManager::Reload(Module* mod, HandlerBase1<void, bool>* callback)
 /* We must load the modules AFTER initializing the socket engine, now */
 void ModuleManager::LoadAll()
 {
-	ModCount = 0;
-
 	std::cout << std::endl << "Loading core commands";
 	fflush(stdout);
 
diff --git a/src/modules.cpp b/src/modules.cpp
index b6a28193a..80d80cb43 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -162,7 +162,7 @@ ModResult   Module::OnAcceptConnection(int, ListenSocket*, irc::sockets::sockadd
 void		Module::OnSendWhoLine(User*, const std::vector<std::string>&, User*, std::string&) { DetachEvent(I_OnSendWhoLine); }
 void		Module::OnSetUserIP(LocalUser*) { DetachEvent(I_OnSetUserIP); }
 
-ModuleManager::ModuleManager() : ModCount(0)
+ModuleManager::ModuleManager()
 {
 }
 
@@ -388,7 +388,6 @@ void ModuleManager::DoSafeUnload(Module* mod)
 	ServerInstance->GlobalCulls.AddItem(mod);
 
 	ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, "Module %s unloaded",mod->ModuleSourceFile.c_str());
-	this->ModCount--;
 	ServerInstance->ISupport.Build();
 }
 
-- 
cgit v1.2.3