All of insp now builds with -pedantic (theres some warnings to squash in modules...

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

diff --git a/src/modules/extra/m_httpclienttest.cpp b/src/modules/extra/m_httpclienttest.cpp
index 5ec097aaf4ed323bcd7825baa099342c73e7c4ba..c5fe85a22f1dc0430067a92477ac8b1293af4d07 100644 (file)
--- a/src/modules/extra/m_httpclienttest.cpp
+++ b/src/modules/extra/m_httpclienttest.cpp
@@ -43,7 +43,7 @@ public:
                return Version(1,0,0,1,VF_VENDOR,API_VERSION);
        }
 
-       virtual void OnUserJoin(userrec* user, chanrec* channel, bool &silent)
+       virtual void OnUserJoin(User* user, Channel* channel, bool &silent)
        {
                // method called when a user joins a channel
 
@@ -51,7 +51,7 @@ public:
                std::string nick = user->nick;
                ServerInstance->Log(DEBUG,"User " + nick + " joined " + chan);
 
-               Module* target = ServerInstance->FindModule("m_http_client.so");
+               Module* target = ServerInstance->Modules->Find("m_http_client.so");
                if(target)
                {
                        HTTPClientRequest req(ServerInstance, this, target, "http://znc.in/~psychon");
@@ -71,32 +71,11 @@ public:
                return NULL;
        }
 
-       virtual void OnUserPart(userrec* user, chanrec* channel, const std::string &partmessage, bool &silent)
+       virtual void OnUserPart(User* user, Channel* channel, const std::string &partmessage, bool &silent)
        {
        }
 
 };
 
-class MyModuleFactory : public ModuleFactory
-{
-public:
-       MyModuleFactory()
-       {
-       }
-
-       ~MyModuleFactory()
-       {
-       }
-
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new MyModule(Me);
-       }
-
-};
-
-extern "C" void * init_module( void )
-{
-       return new MyModuleFactory;
-}
+MODULE_INIT(MyModule)