Clarify handshake failure messages

[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 c3a9c514f3e21411164097979527cfc291d0973c..6c6f060e85ea3f3b521e631e519fcbd7783de2b3 100644 (file)
--- a/src/modules/m_randquote.cpp
+++ b/src/modules/m_randquote.cpp
@@ -55,26 +55,24 @@ class ModuleRandQuote : public Module
 {
  private:
        CommandRandquote cmd;
-       ConfigReader *conf;
  public:
-       ModuleRandQuote(InspIRCd* Me)
-               : Module(Me), cmd(this)
+       ModuleRandQuote()
+               : cmd(this)
        {
-
-               conf = new ConfigReader(ServerInstance);
+               ConfigReader conf;
                // Sort the Randomizer thingie..
                srand(ServerInstance->Time());
 
-               q_file = conf->ReadValue("randquote","file",0);
-               prefix = conf->ReadValue("randquote","prefix",0);
-               suffix = conf->ReadValue("randquote","suffix",0);
+               q_file = conf.ReadValue("randquote","file",0);
+               prefix = conf.ReadValue("randquote","prefix",0);
+               suffix = conf.ReadValue("randquote","suffix",0);
 
                if (q_file.empty())
                {
                        throw ModuleException("m_randquote: Quotefile not specified - Please check your config.");
                }
 
-               quotes = new FileReader(ServerInstance, q_file);
+               quotes = new FileReader(q_file);
                if(!quotes->Exists())
                {
                        throw ModuleException("m_randquote: QuoteFile not Found!! Please check your config - module will not function.");
@@ -91,16 +89,15 @@ class ModuleRandQuote : public Module
 
        virtual ~ModuleRandQuote()
        {
-               delete conf;
                delete quotes;
        }
 
        virtual Version GetVersion()
        {
-               return Version("Provides random Quotes on Connect.",VF_VENDOR,API_VERSION);
+               return Version("Provides random Quotes on Connect.",VF_VENDOR);
        }
 
-       virtual void OnUserConnect(User* user)
+       virtual void OnUserConnect(LocalUser* user)
        {
                cmd.Handle(std::vector<std::string>(), user);
        }