dz is determined to crash your ircd :P

[user/henk/code/inspircd.git] / src / modules / m_operjoin.cpp

diff --git a/src/modules/m_operjoin.cpp b/src/modules/m_operjoin.cpp
index c733bd3a11573da32df26c1a5a5200c6170ebc2d..45fcf6be85ad3345be2d2c0faacb805930ae33b6 100644 (file)
--- a/src/modules/m_operjoin.cpp
+++ b/src/modules/m_operjoin.cpp
@@ -11,9 +11,6 @@
  * ---------------------------------------------------
  */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 
 /* $ModDesc: Forces opers to join the specified channel(s) on oper-up */
@@ -44,7 +41,7 @@ class ModuleOperjoin : public Module
                }
 
        public:
-               ModuleOperjoin(InspIRCd* Me) : Module::Module(Me)
+               ModuleOperjoin(InspIRCd* Me) : Module(Me)
                {
                        OnRehash(NULL, "");
                }
@@ -63,7 +60,7 @@ class ModuleOperjoin : public Module
                        if (!operChan.empty())
                                tokenize(operChan,operChans);
 
-                       DELETE(conf);
+                       delete conf;
                }
 
                virtual ~ModuleOperjoin()
@@ -87,24 +84,4 @@ class ModuleOperjoin : public Module
 
 };
 
-class ModuleOperjoinFactory : public ModuleFactory
-{
-       public:
-               ModuleOperjoinFactory()
-               {
-               }
-
-               ~ModuleOperjoinFactory()
-               {
-               }
-
-               virtual Module * CreateModule(InspIRCd* Me)
-               {
-                       return new ModuleOperjoin(Me);
-               }
-};
-
-extern "C" void * init_module( void )
-{
-       return new ModuleOperjoinFactory;
-}
+MODULE_INIT(ModuleOperjoin)