Remove ModuleManager::GetAllModuleNames(), use GetModules() instead

2 files changed, 11 insertions, 11 deletions

diff --git a/src/modules/m_httpd_stats.cpp b/src/modules/m_httpd_stats.cpp
index 022d91f1e..5114b26d5 100644
--- a/src/modules/m_httpd_stats.cpp
+++ b/src/modules/m_httpd_stats.cpp
@@ -141,13 +141,12 @@ class ModuleHttpStats : public Module
 				}
 
 				data << "</xlines><modulelist>";
-				std::vector<std::string> module_names = ServerInstance->Modules->GetAllModuleNames(0);
+				const ModuleManager::ModuleMap& mods = ServerInstance->Modules->GetModules();
 
-				for (std::vector<std::string>::iterator i = module_names.begin(); i != module_names.end(); ++i)
+				for (ModuleManager::ModuleMap::const_iterator i = mods.begin(); i != mods.end(); ++i)
 				{
-					Module* m = ServerInstance->Modules->Find(i->c_str());
-					Version v = m->GetVersion();
-					data << "<module><name>" << *i << "</name><description>" << Sanitize(v.description) << "</description></module>";
+					Version v = i->second->GetVersion();
+					data << "<module><name>" << i->first << "</name><description>" << Sanitize(v.description) << "</description></module>";
 				}
 				data << "</modulelist><channellist>";
 
diff --git a/src/modules/m_spanningtree/capab.cpp b/src/modules/m_spanningtree/capab.cpp
index 1ca5b982c..f4f1e1ace 100644
--- a/src/modules/m_spanningtree/capab.cpp
+++ b/src/modules/m_spanningtree/capab.cpp
@@ -28,17 +28,18 @@
 
 std::string TreeSocket::MyModules(int filter)
 {
-	std::vector<std::string> modlist = ServerInstance->Modules->GetAllModuleNames(filter);
+	const ModuleManager::ModuleMap& modlist = ServerInstance->Modules->GetModules();
 
 	std::string capabilities;
-	sort(modlist.begin(),modlist.end());
-	for (std::vector<std::string>::const_iterator i = modlist.begin(); i != modlist.end(); ++i)
+	for (ModuleManager::ModuleMap::const_iterator i = modlist.begin(); i != modlist.end(); ++i)
 	{
+		Version v = i->second->GetVersion();
+		if (!(v.Flags & filter))
+			continue;
+
 		if (i != modlist.begin())
 			capabilities.push_back(' ');
-		capabilities.append(*i);
-		Module* m = ServerInstance->Modules->Find(*i);
-		Version v = m->GetVersion();
+		capabilities.append(i->first);
 		if (!v.link_data.empty())
 		{
 			capabilities.push_back('=');