Move everything module-related out of InspIRCd and into ModuleManager, there is a ModuleManager instantiated as InspIRCd::Modules. Several of the function names have changed slightly as well. e.g. Instance->FindModule(m_foobar.so); is now Instance->Modules->Find(m_foobar.so);

All modules in the core distribution should also be updated in line with these changes.

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

1 files changed, 7 insertions, 8 deletions

diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp
index 5d8eeef7d..a78e8c61b 100644
--- a/src/modules/extra/m_mysql.cpp
+++ b/src/modules/extra/m_mysql.cpp
@@ -713,7 +713,7 @@ class ModuleSQL : public Module
 	ModuleSQL(InspIRCd* Me)
 	: Module::Module(Me), rehashing(false)
 	{
-		ServerInstance->UseInterface("SQLutils");
+		ServerInstance->Modules->UseInterface("SQLutils");
 
 		Conf = new ConfigReader(ServerInstance);
 		PublicServerInstance = ServerInstance;
@@ -730,24 +730,24 @@ class ModuleSQL : public Module
 			throw ModuleException("m_mysql: Failed to create dispatcher thread: " + std::string(strerror(errno)));
 		}
 
-		if (!ServerInstance->PublishFeature("SQL", this))
+		if (!ServerInstance->Modules->PublishFeature("SQL", this))
 		{
 			/* Tell worker thread to exit NOW */
 			giveup = true;
 			throw ModuleException("m_mysql: Unable to publish feature 'SQL'");
 		}
 
-		ServerInstance->PublishInterface("SQL", this);
+		ServerInstance->Modules->PublishInterface("SQL", this);
 	}
 
 	virtual ~ModuleSQL()
 	{
 		giveup = true;
 		ClearAllConnections();
-		DELETE(Conf);
-		ServerInstance->UnpublishInterface("SQL", this);
-		ServerInstance->UnpublishFeature("SQL");
-		ServerInstance->DoneWithInterface("SQLutils");
+		delete Conf;
+		ServerInstance->Modules->UnpublishInterface("SQL", this);
+		ServerInstance->Modules->UnpublishFeature("SQL");
+		ServerInstance->Modules->DoneWithInterface("SQLutils");
 	}
 
 
@@ -886,4 +886,3 @@ void* DispatcherThread(void* arg)
 }
 
 MODULE_INIT(ModuleSQL);
-