- Tear out a useless load of XLine clutters that did nothing much except confuse...

[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 a918b4234ca0c1d5c088a48d29f6b4239b7a31cc..830be12e81cb033c43d9bfb6506a569807f42131 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";
@@ -39,7 +36,7 @@ class ModuleUHNames : public Module
        {
        }
 
-       void OnSyncUserMetaData(userrec* user, Module* proto,void* opaque, const std::string &extname, bool displayable)
+       void OnSyncUserMetaData(User* user, Module* proto,void* opaque, const std::string &extname, bool displayable)
        {
                if ((displayable) && (extname == "UHNAMES"))
                        proto->ProtoSendMetaData(opaque, TYPE_USER, user, extname, "Enabled");
@@ -57,10 +54,10 @@ class ModuleUHNames : public Module
 
        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, User *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,
@@ -80,7 +77,7 @@ class ModuleUHNames : public Module
        }
 
        /* IMPORTANT: This must be prioritized above NAMESX! */
-       virtual int OnUserList(userrec* user, chanrec* Ptr, CUList* &ulist)
+       virtual int OnUserList(User* user, Channel* Ptr, CUList* &ulist)
        {
                if (user->GetExt("UHNAMES"))
                {
@@ -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" DllExport void * init_module( void )
-{
-       return new ModuleUHNamesFactory;
-}
-
+MODULE_INIT(ModuleUHNames)