Remove InspIRCd* parameters and fields

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

1 files changed, 4 insertions, 5 deletions

diff --git a/src/modules/m_operjoin.cpp b/src/modules/m_operjoin.cpp
index 6b94a4ef9..ac4aab548 100644
--- a/src/modules/m_operjoin.cpp
+++ b/src/modules/m_operjoin.cpp
@@ -43,8 +43,7 @@ class ModuleOperjoin : public Module
 		}
 
 	public:
-		ModuleOperjoin(InspIRCd* Me) : Module(Me)
-		{
+		ModuleOperjoin() 		{
 			OnRehash(NULL);
 		Implementation eventlist[] = { I_OnPostOper, I_OnRehash };
 		ServerInstance->Modules->Attach(eventlist, this, 2);
@@ -53,7 +52,7 @@ class ModuleOperjoin : public Module
 
 		virtual void OnRehash(User* user)
 		{
-			ConfigReader* conf = new ConfigReader(ServerInstance);
+			ConfigReader* conf = new ConfigReader;
 
 			operChan = conf->ReadValue("operjoin", "channel", 0);
 			override = conf->ReadFlag("operjoin", "override", "0", 0);
@@ -92,7 +91,7 @@ class ModuleOperjoin : public Module
 
 			for(std::vector<std::string>::iterator it = operChans.begin(); it != operChans.end(); it++)
 				if (ServerInstance->IsChannel(it->c_str(), ServerInstance->Config->Limits.ChanMax))
-					Channel::JoinUser(ServerInstance, user, it->c_str(), override, "", false, ServerInstance->Time());
+					Channel::JoinUser(user, it->c_str(), override, "", false, ServerInstance->Time());
 
 			std::map<std::string, std::vector<std::string> >::iterator i = operTypeChans.find(user->oper);
 
@@ -103,7 +102,7 @@ class ModuleOperjoin : public Module
 				{
 					if (ServerInstance->IsChannel(it->c_str(), ServerInstance->Config->Limits.ChanMax))
 					{
-						Channel::JoinUser(ServerInstance, user, it->c_str(), override, "", false, ServerInstance->Time());
+						Channel::JoinUser(user, it->c_str(), override, "", false, ServerInstance->Time());
 					}
 				}
 			}