X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operjoin.cpp;h=ae92a12551eed88c6766f61aad20d1e40a54e8a2;hb=2ab88037d8d7d6df3fb9686216a0b36f5ece2313;hp=5576fd3f9afdbd9f6860eb07a0094052838d80cd;hpb=76d7e8a0684b38a82e6c05ebd7538b69660e1bef;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operjoin.cpp b/src/modules/m_operjoin.cpp
index 5576fd3f9..ae92a1255 100644
--- a/src/modules/m_operjoin.cpp
+++ b/src/modules/m_operjoin.cpp
@@ -12,9 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
 /* $ModDesc: Forces opers to join the specified channel(s) on oper-up */
 
@@ -54,7 +51,7 @@ class ModuleOperjoin : public Module
 			List[I_OnPostOper] = List[I_OnRehash] = 1;
 		}
 
-		virtual void OnRehash(userrec* user, const std::string &parameter)
+		virtual void OnRehash(User* user, const std::string &parameter)
 		{
 			ConfigReader* conf = new ConfigReader(ServerInstance);
 
@@ -63,7 +60,7 @@ class ModuleOperjoin : public Module
 			if (!operChan.empty())
 				tokenize(operChan,operChans);
 
-			DELETE(conf);
+			delete conf;
 		}
 
 		virtual ~ModuleOperjoin()
@@ -75,36 +72,16 @@ class ModuleOperjoin : public Module
 			return Version(1,1,0,1,VF_VENDOR,API_VERSION);
 		}
 
-		virtual void OnPostOper(userrec* user, const std::string &opertype)
+		virtual void OnPostOper(User* user, const std::string &opertype)
 		{
 			if (!IS_LOCAL(user))
 				return;
 
 			for(std::vector<std::string>::iterator it = operChans.begin(); it != operChans.end(); it++)
 				if (ServerInstance->IsChannel(it->c_str()))
-					chanrec::JoinUser(ServerInstance, user, it->c_str(), false, "", ServerInstance->Time(true));
+					Channel::JoinUser(ServerInstance, user, it->c_str(), false, "", ServerInstance->Time(true));
 		}
 
 };
 
-class ModuleOperjoinFactory : public ModuleFactory
-{
-	public:
-		ModuleOperjoinFactory()
-		{
-		}
-
-		~ModuleOperjoinFactory()
-		{
-		}
-
-		virtual Module * CreateModule(InspIRCd* Me)
-		{
-			return new ModuleOperjoin(Me);
-		}
-};
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleOperjoinFactory;
-}
+MODULE_INIT(ModuleOperjoin)