Fixes found by removing User inheritance from StreamSocket

[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 af8f0690fb9d2d0fed399159a179a6357472317c..b34b248fdacfc0e57e68d65f2bc9e5da2a7e5c88 100644 (file)
--- a/src/modules/m_uhnames.cpp
+++ b/src/modules/m_uhnames.cpp
@@ -21,10 +21,10 @@ class ModuleUHNames : public Module
  public:
        GenericCap cap;
 
-       ModuleUHNames(InspIRCd* Me) : Module(Me), cap(this, "userhost-in-names")
+       ModuleUHNames() : cap(this, "userhost-in-names")
        {
                Implementation eventlist[] = { I_OnEvent, I_OnPreCommand, I_OnNamesListItem, I_On005Numeric };
-               ServerInstance->Modules->Attach(eventlist, this, 5);
+               ServerInstance->Modules->Attach(eventlist, this, 4);
        }
 
        ~ModuleUHNames()
@@ -33,7 +33,7 @@ class ModuleUHNames : public Module
 
        Version GetVersion()
        {
-               return Version("$Id$",VF_VENDOR,API_VERSION);
+               return Version("Provides the UHNAMES facility.",VF_VENDOR);
        }
 
        void On005Numeric(std::string &output)
@@ -60,7 +60,7 @@ class ModuleUHNames : public Module
                return MOD_RES_PASSTHRU;
        }
 
-       void OnNamesListItem(User* issuer, User* user, Channel* channel, std::string &prefixes, std::string &nick)
+       void OnNamesListItem(User* issuer, Membership* memb, std::string &prefixes, std::string &nick)
        {
                if (!cap.ext.get(issuer))
                        return;
@@ -68,10 +68,10 @@ class ModuleUHNames : public Module
                if (nick.empty())
                        return;
 
-               nick = user->GetFullHost();
+               nick = memb->user->GetFullHost();
        }
 
-       void OnEvent(Event* ev)
+       void OnEvent(Event& ev)
        {
                cap.HandleEvent(ev);
        }