OOPS! We try again, since I'm smoking craq. LF is 0x0a NOT CR.

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

diff --git a/src/modules/m_taxonomy.cpp b/src/modules/m_taxonomy.cpp
index c573e77610d03e1505f62d857f1c84f53280f886..79dc8e23feeb616e68a2229e996b82e36b0ce4ce 100644 (file)
--- a/src/modules/m_taxonomy.cpp
+++ b/src/modules/m_taxonomy.cpp
@@ -11,11 +11,10 @@
  * ---------------------------------------------------
  */
 
-#include <stdio.h>
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "inspircd.h"
 
 /* $ModDesc: Provides the /TAXONOMY command, used to view all metadata attached to a user */
 
@@ -62,7 +61,7 @@ class ModuleTaxonomy : public Module
        bool claimed;
  public:
        ModuleTaxonomy(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
                
                // Create a new command
@@ -96,28 +95,5 @@ class ModuleTaxonomy : public Module
        }
 };
 
-
-class ModuleTaxonomyFactory : public ModuleFactory
-{
- public:
-       ModuleTaxonomyFactory()
-       {
-       }
-       
-       ~ModuleTaxonomyFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleTaxonomy(Me);
-       }
-       
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleTaxonomyFactory;
-}
+MODULE_INIT(ModuleTaxonomy)