Fix for bug #415, affects only trunk (wish i'd known this before i started!)

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

diff --git a/src/modules/m_uhnames.cpp b/src/modules/m_uhnames.cpp
index 3663ab4ca488e08a5295478da8cf574c4c494f74..41534eca40713ad4458cc5156032d330d1f57d1e 100644 (file)
--- a/src/modules/m_uhnames.cpp
+++ b/src/modules/m_uhnames.cpp
@@ -11,9 +11,6 @@
  * ---------------------------------------------------
  */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 
 static const char* dummy = "ON";
@@ -26,7 +23,7 @@ class ModuleUHNames : public Module
  public:
        
        ModuleUHNames(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
        }
 
@@ -39,7 +36,7 @@ class ModuleUHNames : public Module
        {
        }
 
-        void OnSyncUserMetaData(userrec* user, Module* proto,void* opaque, const std::string &extname, bool displayable)
+       void OnSyncUserMetaData(userrec* user, Module* proto,void* opaque, const std::string &extname, bool displayable)
        {
                if ((displayable) && (extname == "UHNAMES"))
                        proto->ProtoSendMetaData(opaque, TYPE_USER, user, extname, "Enabled");
@@ -50,17 +47,17 @@ class ModuleUHNames : public Module
                return Version(1,1,0,1,VF_VENDOR,API_VERSION);
        }
 
-        virtual void On005Numeric(std::string &output)
+       virtual void On005Numeric(std::string &output)
        {
                output.append(" UHNAMES");
        }
 
        Priority Prioritize()
        {
-               return (Priority)ServerInstance->PriorityBefore("m_namesx.so");
+               return (Priority)ServerInstance->Modules->PriorityBefore("m_namesx.so");
        }
 
-        virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line)
+       virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line)
        {
                irc::string c = command.c_str();
                /* We don't actually create a proper command handler class for PROTOCTL,
@@ -94,27 +91,4 @@ class ModuleUHNames : public Module
        }
 };
 
-
-class ModuleUHNamesFactory : public ModuleFactory
-{
- public:
-       ModuleUHNamesFactory()
-       {
-       }
-
-       ~ModuleUHNamesFactory()
-       {
-       }
-
-               virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleUHNames(Me);
-       }
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleUHNamesFactory;
-}
-
+MODULE_INIT(ModuleUHNames)