X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_httpclienttest.cpp;h=c5fe85a22f1dc0430067a92477ac8b1293af4d07;hb=2e1f86fd0c9911210b79e6ac346672441eef18c4;hp=19c6c376baa94d57a20e4351466e03afca8f1dbc;hpb=206e3b49c7bfe3e8a7ca972103fe9e30feb3a86a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/extra/m_httpclienttest.cpp b/src/modules/extra/m_httpclienttest.cpp
index 19c6c376b..c5fe85a22 100644
--- a/src/modules/extra/m_httpclienttest.cpp
+++ b/src/modules/extra/m_httpclienttest.cpp
@@ -11,10 +11,10 @@
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "inspircd.h"
 #include "httpclient.h"
 
 /* $ModDep: httpclient.h */
@@ -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)
-	{
-	}
-
-};
-
-class MyModuleFactory : public ModuleFactory
-{
-public:
-	MyModuleFactory()
-	{
-	}
-
-	~MyModuleFactory()
+	virtual void OnUserPart(User* user, Channel* channel, const std::string &partmessage, bool &silent)
 	{
 	}
 
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new MyModule(Me);
-	}
-
 };
 
-extern "C" void * init_module( void )
-{
-	return new MyModuleFactory;
-}
+MODULE_INIT(MyModule)