Remove InspIRCd* parameters and fields

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

diff --git a/src/modules/m_abbreviation.cpp b/src/modules/m_abbreviation.cpp
index dc298d726f85be3a2cb0d94b781f6162e41b21c8..c8aadfcae149cf29b0a01568b2665455d575519b 100644 (file)
--- a/src/modules/m_abbreviation.cpp
+++ b/src/modules/m_abbreviation.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -20,24 +20,23 @@ class ModuleAbbreviation : public Module
 
  public:
 
-       ModuleAbbreviation(InspIRCd* Me)
-               : Module(Me)
-       {
-               Me->Modules->Attach(I_OnPreCommand, this);
+       ModuleAbbreviation()
+                       {
+               ServerInstance->Modules->Attach(I_OnPreCommand, this);
                /* Must do this first */
-               Me->Modules->SetPriority(this, I_OnPreCommand, PRIO_FIRST);
+               ServerInstance->Modules->SetPriority(this, I_OnPreCommand, PRIORITY_FIRST);
        }
 
        virtual Version GetVersion()
        {
-               return Version(1,2,0,0,VF_VENDOR,API_VERSION);
+               return Version("Provides the ability to abbreviate commands a-la BBC BASIC keywords.",VF_VENDOR,API_VERSION);
        }
 
-       virtual int OnPreCommand(std::string &command, std::vector<std::string> &parameters, User *user, bool validated, const std::string &original_line)
+       virtual ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, User *user, bool validated, const std::string &original_line)
        {
                /* Command is already validated, has a length of 0, or last character is not a . */
                if (validated || command.empty() || *command.rbegin() != '.')
-                       return 0;
+                       return MOD_RES_PASSTHRU;
 
                /* Whack the . off the end */
                command.erase(command.end() - 1);
@@ -56,7 +55,7 @@ class ModuleAbbreviation : public Module
                                if (matchlist.length() > 450)
                                {
                                        user->WriteNumeric(420, "%s :Ambiguous abbreviation and too many possible matches.", user->nick.c_str());
-                                       return true;
+                                       return MOD_RES_DENY;
                                }
 
                                if (!foundmatch)
@@ -74,7 +73,7 @@ class ModuleAbbreviation : public Module
                if (!matchlist.empty())
                {
                        user->WriteNumeric(420, "%s :Ambiguous abbreviation, posssible matches: %s%s", user->nick.c_str(), foundcommand.c_str(), matchlist.c_str());
-                       return true;
+                       return MOD_RES_DENY;
                }
 
                if (foundcommand.empty())
@@ -87,7 +86,7 @@ class ModuleAbbreviation : public Module
                        command = foundcommand;
                }
 
-               return false;
+               return MOD_RES_PASSTHRU;
        }
 };