PROPAGATE this fix

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

diff --git a/src/modules/extra/m_sqlutils.cpp b/src/modules/extra/m_sqlutils.cpp
index 131e20e5e13a45a974d763a88515879a5687fdfa..2edf282636c589a35d69e86d8cb12545e2927e97 100644 (file)
--- a/src/modules/extra/m_sqlutils.cpp
+++ b/src/modules/extra/m_sqlutils.cpp
@@ -11,18 +11,13 @@
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include <sstream>
-#include <string>
-#include <map>
 #include <list>
-
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-
-#include "inspircd.h"
 #include "configreader.h"
-
 #include "m_sqlutils.h"
 
 /* $ModDesc: Provides some utilities to SQL client modules, such as mapping queries to users and channels */
@@ -42,12 +37,12 @@ public:
        ModuleSQLutils(InspIRCd* Me)
        : Module::Module(Me)
        {
-               ServerInstance->PublishInterface("SQLutils", this);
+               ServerInstance->Modules->PublishInterface("SQLutils", this);
        }
 
        virtual ~ModuleSQLutils()
        {
-               ServerInstance->UnpublishInterface("SQLutils", this);
+               ServerInstance->Modules->UnpublishInterface("SQLutils", this);
        }       
 
        void Implements(char* List)
@@ -239,25 +234,4 @@ public:
        
 };
 
-class ModuleSQLutilsFactory : public ModuleFactory
-{
- public:
-       ModuleSQLutilsFactory()
-       {
-       }
-       
-       ~ModuleSQLutilsFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleSQLutils(Me);
-       }
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleSQLutilsFactory;
-}
+MODULE_INIT(ModuleSQLutils);