From 54fb0cd5aa7d090d5c3da5ab54988c86ba8a2e8e Mon Sep 17 00:00:00 2001
From: danieldg
Date: Mon, 16 Nov 2009 17:59:06 +0000
Subject: Use ServiceProvider for inter-module dependencies

This will stop dependency chains from preventing module reloads when
it is not actually needed; however, it removes some failsafes that will
need to be reimplemented in order to avoid unmapped vtables.

This deprecates Request as an inter-module signaling mechanism, although
SQL still uses it.

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@12140 e03df62e-2008-0410-955e-edbf42e46eb7
---
 src/modules/m_sqllog.cpp | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

(limited to 'src/modules/m_sqllog.cpp')

diff --git a/src/modules/m_sqllog.cpp b/src/modules/m_sqllog.cpp
index 8ff12a8d9..29fa320db 100644
--- a/src/modules/m_sqllog.cpp
+++ b/src/modules/m_sqllog.cpp
@@ -156,15 +156,15 @@ class ModuleSQLLog : public Module
 
  public:
 	ModuleSQLLog()
-		{
-		ServerInstance->Modules->UseInterface("SQLutils");
-		ServerInstance->Modules->UseInterface("SQL");
-
+	{
 		Module* SQLutils = ServerInstance->Modules->Find("m_sqlutils.so");
 		if (!SQLutils)
 			throw ModuleException("Can't find m_sqlutils.so. Please load m_sqlutils.so before m_sqlauth.so.");
 
-		SQLModule = ServerInstance->Modules->FindFeature("SQL");
+		ServiceProvider* prov = ServerInstance->Modules->FindService(SERVICE_DATA, "SQL");
+		if (!prov)
+			throw ModuleException("Can't find an SQL provider module. Please load one before attempting to load m_sqlauth.");
+		SQLModule = prov->creator;
 
 		OnRehash(NULL);
 		MyMod = this;
@@ -175,13 +175,6 @@ class ModuleSQLLog : public Module
 		ServerInstance->Modules->Attach(eventlist, this, 8);
 	}
 
-	virtual ~ModuleSQLLog()
-	{
-		ServerInstance->Modules->DoneWithInterface("SQL");
-		ServerInstance->Modules->DoneWithInterface("SQLutils");
-	}
-
-
 	void ReadConfig()
 	{
 		ConfigReader Conf;
-- 
cgit v1.3.1-10-gc9f91