Remove our vectors of Module*/ircd_module*, replace with a map of std::pair<ircd_module*, Module*>

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

2 files changed, 2 insertions, 17 deletions

diff --git a/include/configreader.h b/include/configreader.h
index 67fe2e2bf..76ca6084a 100644
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -499,11 +499,6 @@ class CoreExport ServerConfig : public Extensible
 	 */
 	ClassVector Classes;
 
-	/** A list of module names (names only, no paths)
-	 * which are currently loaded by the server.
-	 */
-	std::vector<std::string> module_names;
-
 	/** A list of the classes for listening client ports
 	 */
 	std::vector<ListenSocket*> ports;
diff --git a/include/modules.h b/include/modules.h
index a42292ad1..49fd0da50 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -1565,22 +1565,12 @@ class CoreExport ModuleManager : public classbase
 	 */
 	InspIRCd* Instance;
 
+	std::map<std::string, std::pair<ircd_module*, Module*> > Modules;
+
  public:
 
 	EventHandlerList EventHandlers;
 
-	/** A list of ircd_module* module handles
-	 * Note that this list is always exactly 255 in size.
-	 * The actual number of loaded modules is available from GetModuleCount()
-	 */
-	ModuleHandleList handles;
- 
-  	/** A list of Module* module classes
-	 * Note that this list is always exactly 255 in size.
-	 * The actual number of loaded modules is available from GetModuleCount()
-	 */
-	ModuleList modules;	 
-
 	/** Simple, bog-standard, boring constructor.
 	 */
 	ModuleManager(InspIRCd* Ins);