Note: FOR THE MOMENT, this is BROKEN. It wont run right until im done.

Changed Parameter for modules from Server* to InspIRCd*.
TODO: Move remaining Server* Modules into InspIRCd* and remove class Server.


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

10 files changed, 30 insertions, 30 deletions

diff --git a/src/modules/extra/m_filter_pcre.cpp b/src/modules/extra/m_filter_pcre.cpp
index 0f52c6aa4..a885046bb 100644
--- a/src/modules/extra/m_filter_pcre.cpp
+++ b/src/modules/extra/m_filter_pcre.cpp
@@ -54,7 +54,7 @@ class ModuleFilterPCRE : public Module
 	int erroffset;
  
  public:
-	ModuleFilterPCRE(Server* Me)
+	ModuleFilterPCRE(InspIRCd* Me)
 		: Module::Module(Me)
 	{
 		// read the configuration file on startup.
@@ -62,7 +62,7 @@ class ModuleFilterPCRE : public Module
 		// main config file, then append your <keyword> tags to the bottom
 		// of the main config... but rather messy. That's why the capability
 		// of using a seperate config file is provided.
-		Srv = Me;
+		
 		Conf = new ConfigReader;
 		std::string filterfile = Conf->ReadValue("filter","file",0);
 		MyConf = new ConfigReader(filterfile);
@@ -214,7 +214,7 @@ class ModuleFilterPCREFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
 		return new ModuleFilterPCRE(Me);
 	}
diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp
index 5eaa0e8d3..f7738d5cf 100644
--- a/src/modules/extra/m_mysql.cpp
+++ b/src/modules/extra/m_mysql.cpp
@@ -789,10 +789,10 @@ class ModuleSQL : public Module
 		return NULL;
 	}
 
-	ModuleSQL(Server* Me)
+	ModuleSQL(InspIRCd* Me)
 		: Module::Module(Me)
 	{
-		Srv = Me;
+		
 		Conf = new ConfigReader();
 		currid = 0;
 		SQLModule = this;
@@ -922,7 +922,7 @@ class ModuleSQLFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
 		return new ModuleSQL(Me);
 	}
diff --git a/src/modules/extra/m_pgsql.cpp b/src/modules/extra/m_pgsql.cpp
index 988700d41..41582fefb 100644
--- a/src/modules/extra/m_pgsql.cpp
+++ b/src/modules/extra/m_pgsql.cpp
@@ -519,8 +519,8 @@ private:
 	char* sqlsuccess;
 
 public:
-	ModulePgSQL(Server* Me)
-	: Module::Module(Me), Srv(Me), currid(0)
+	ModulePgSQL(InspIRCd* Me)
+	: Module::Module(Me), currid(0)
 	{
 		log(DEBUG, "%s 'SQL' feature", ServerInstance->PublishFeature("SQL", this) ? "Published" : "Couldn't publish");
 		
@@ -1216,7 +1216,7 @@ class ModulePgSQLFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
 		return new ModulePgSQL(Me);
 	}
diff --git a/src/modules/extra/m_sqlauth.cpp b/src/modules/extra/m_sqlauth.cpp
index 960a3c540..17d4f69ac 100644
--- a/src/modules/extra/m_sqlauth.cpp
+++ b/src/modules/extra/m_sqlauth.cpp
@@ -45,8 +45,8 @@ class ModuleSQLAuth : public Module
 	bool verbose;
 	
 public:
-	ModuleSQLAuth(Server* Me)
-	: Module::Module(Me), Srv(Me)
+	ModuleSQLAuth(InspIRCd* Me)
+		: Module::Module(Me)
 	{
 		SQLutils = ServerInstance->FindFeature("SQLutils");
 		
@@ -233,7 +233,7 @@ class ModuleSQLAuthFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
 		return new ModuleSQLAuth(Me);
 	}
diff --git a/src/modules/extra/m_sqllog.cpp b/src/modules/extra/m_sqllog.cpp
index b2ddf1c5d..4220724a6 100644
--- a/src/modules/extra/m_sqllog.cpp
+++ b/src/modules/extra/m_sqllog.cpp
@@ -285,9 +285,9 @@ class ModuleSQLLog : public Module
 		return (SQLModule);
 	}
 
-	ModuleSQLLog(Server* Me) : Module::Module(Me)
+	ModuleSQLLog(InspIRCd* Me) : Module::Module(Me)
 	{
-		Srv = Me;
+		
 		ReadConfig();
 		MyMod = this;
 		active_queries.clear();
@@ -422,7 +422,7 @@ class ModuleSQLLogFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
 		return new ModuleSQLLog(Me);
 	}
diff --git a/src/modules/extra/m_sqloper.cpp b/src/modules/extra/m_sqloper.cpp
index cd4ef7102..9a2422aa8 100644
--- a/src/modules/extra/m_sqloper.cpp
+++ b/src/modules/extra/m_sqloper.cpp
@@ -37,8 +37,8 @@ class ModuleSQLOper : public Module
 	std::string databaseid;
 
 public:
-	ModuleSQLOper(Server* Me)
-	: Module::Module(Me), Srv(Me)
+	ModuleSQLOper(InspIRCd* Me)
+		: Module::Module(Me)
 	{
 		SQLutils = ServerInstance->FindFeature("SQLutils");
 		
@@ -264,7 +264,7 @@ class ModuleSQLOperFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
 		return new ModuleSQLOper(Me);
 	}
diff --git a/src/modules/extra/m_sqlutils.cpp b/src/modules/extra/m_sqlutils.cpp
index f2085cbcd..6ce57db45 100644
--- a/src/modules/extra/m_sqlutils.cpp
+++ b/src/modules/extra/m_sqlutils.cpp
@@ -46,8 +46,8 @@ private:
 	IdChanMap idchan;
 
 public:
-	ModuleSQLutils(Server* Me)
-	: Module::Module(Me), Srv(Me)
+	ModuleSQLutils(InspIRCd* Me)
+	: Module::Module(Me)
 	{
 		log(DEBUG, "%s 'SQLutils' feature", ServerInstance->PublishFeature("SQLutils", this) ? "Published" : "Couldn't publish");
 	}
@@ -287,7 +287,7 @@ class ModuleSQLutilsFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
 		return new ModuleSQLutils(Me);
 	}
diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp
index a5cdaf3e0..0ebd6f982 100644
--- a/src/modules/extra/m_ssl_gnutls.cpp
+++ b/src/modules/extra/m_ssl_gnutls.cpp
@@ -66,10 +66,10 @@ class ModuleSSLGnuTLS : public Module
 	
  public:
 	
-	ModuleSSLGnuTLS(Server* Me)
+	ModuleSSLGnuTLS(InspIRCd* Me)
 		: Module::Module(Me)
 	{
-		Srv = Me;
+		
 
 		culllist = new CullList(ServerInstance);
 		
@@ -605,7 +605,7 @@ class ModuleSSLGnuTLSFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
 		return new ModuleSSLGnuTLS(Me);
 	}
diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp
index 7d10b78be..3819d835c 100644
--- a/src/modules/extra/m_ssl_openssl.cpp
+++ b/src/modules/extra/m_ssl_openssl.cpp
@@ -81,10 +81,10 @@ class ModuleSSLOpenSSL : public Module
 	
  public:
 	
-	ModuleSSLOpenSSL(Server* Me)
+	ModuleSSLOpenSSL(InspIRCd* Me)
 		: Module::Module(Me)
 	{
-		Srv = Me;
+		
 
 		culllist = new CullList(ServerInstance);
 		
@@ -670,7 +670,7 @@ class ModuleSSLOpenSSLFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
 		return new ModuleSSLOpenSSL(Me);
 	}
diff --git a/src/modules/extra/m_testclient.cpp b/src/modules/extra/m_testclient.cpp
index a5744f240..5a140500a 100644
--- a/src/modules/extra/m_testclient.cpp
+++ b/src/modules/extra/m_testclient.cpp
@@ -16,8 +16,8 @@ private:
 	Server* Srv;
 
 public:
-	ModuleTestClient(Server* Me)
-	: Module::Module(Me), Srv(Me)
+	ModuleTestClient(InspIRCd* Me)
+		: Module::Module(Me)
 	{
 	}
 
@@ -109,7 +109,7 @@ class ModuleTestClientFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
 		return new ModuleTestClient(Me);
 	}