Socket engine tweaks to fix a glitch, and improvements to new m_ident

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

diff --git a/src/modules/m_randquote.cpp b/src/modules/m_randquote.cpp
index ce1fcfb079c56e189d2bde73d46fec7a3e04026c..435c41453ae4834ce53781e912bc83a8a5df115b 100644 (file)
--- a/src/modules/m_randquote.cpp
+++ b/src/modules/m_randquote.cpp
@@ -12,9 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
 static FileReader *quotes = NULL;
 
@@ -26,15 +23,15 @@ std::string suffix;
 
 /** Handle /RANDQUOTE
  */
-class cmd_randquote : public command_t
+class cmd_randquote : public Command
 {
  public:
-       cmd_randquote (InspIRCd* Instance) : command_t(Instance,"RANDQUOTE", 0, 0)
+       cmd_randquote (InspIRCd* Instance) : Command(Instance,"RANDQUOTE", 0, 0)
        {
                this->source = "m_randquote.so";
        }
 
-       CmdResult Handle (const char** parameters, int pcntl, userrec *user)
+       CmdResult Handle (const char** parameters, int pcntl, User *user)
        {
                std::string str;
                int fsize;
@@ -128,34 +125,11 @@ class ModuleRandQuote : public Module
                return Version(1,1,0,1,VF_VENDOR,API_VERSION);
        }
        
-       virtual void OnUserConnect(userrec* user)
+       virtual void OnUserConnect(User* user)
        {
                if (mycommand)
                        mycommand->Handle(NULL, 0, user);
        }
 };
 
-
-class ModuleRandQuoteFactory : public ModuleFactory
-{
- public:
-       ModuleRandQuoteFactory()
-       {
-       }
-       
-       ~ModuleRandQuoteFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleRandQuote(Me);
-       }
-       
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleRandQuoteFactory;
-}
+MODULE_INIT(ModuleRandQuote)