DOH! Fix my muppetry of a segfault, and fix some warnings

[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 5f8d52714ba4b997ffc43000253fa4197de826e1..02572e7de437e6e0e4bbb2d524c8b87db03c6d52 100644 (file)
--- a/src/modules/m_randquote.cpp
+++ b/src/modules/m_randquote.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -23,15 +23,15 @@ std::string suffix;
 
 /** Handle /RANDQUOTE
  */
-class cmd_randquote : public command_t
+class CommandRandquote : public Command
 {
  public:
-       cmd_randquote (InspIRCd* Instance) : command_t(Instance,"RANDQUOTE", 0, 0)
+       CommandRandquote (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* const* parameters, int pcntl, User *user)
        {
                std::string str;
                int fsize;
@@ -52,27 +52,10 @@ class cmd_randquote : public command_t
        }
 };
 
-/** Thrown by m_randquote
- */
-class RandquoteException : public ModuleException
-{
- private:
-       const std::string err;
- public:
-       RandquoteException(const std::string &message) : err(message) { }
-
-       ~RandquoteException() throw () { }
-
-       virtual const char* GetReason()
-       {
-               return err.c_str();
-       }
-};
-
 class ModuleRandQuote : public Module
 {
  private:
-       cmd_randquote* mycommand;
+       CommandRandquote* mycommand;
        ConfigReader *conf;
  public:
        ModuleRandQuote(InspIRCd* Me)
@@ -91,41 +74,39 @@ class ModuleRandQuote : public Module
 
                if (q_file.empty())
                {
-                       RandquoteException e("m_randquote: Quotefile not specified - Please check your config.");
+                       CoreException e("m_randquote: Quotefile not specified - Please check your config.");
                        throw(e);
                }
 
                quotes = new FileReader(ServerInstance, q_file);
                if(!quotes->Exists())
                {
-                       RandquoteException e("m_randquote: QuoteFile not Found!! Please check your config - module will not function.");
+                       CoreException e("m_randquote: QuoteFile not Found!! Please check your config - module will not function.");
                        throw(e);
                }
                else
                {
                        /* Hidden Command -- Mode clients assume /quote sends raw data to an IRCd >:D */
-                       mycommand = new cmd_randquote(ServerInstance);
+                       mycommand = new CommandRandquote(ServerInstance);
                        ServerInstance->AddCommand(mycommand);
                }
+               Implementation eventlist[] = { I_OnUserConnect };
+               ServerInstance->Modules->Attach(eventlist, this, 1);
        }
 
-       void Implements(char* List)
-       {
-               List[I_OnUserConnect] = 1;
-       }
        
        virtual ~ModuleRandQuote()
        {
-               DELETE(conf);
-               DELETE(quotes);
+               delete conf;
+               delete quotes;
        }
        
        virtual Version GetVersion()
        {
-               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+               return Version(1,2,0,1,VF_VENDOR,API_VERSION);
        }
        
-       virtual void OnUserConnect(userrec* user)
+       virtual void OnUserConnect(User* user)
        {
                if (mycommand)
                        mycommand->Handle(NULL, 0, user);