Textual improvements and fixes such as typos, casing, etc. (#1612)

[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 2a38bd3a674f16a57b2ae4f6a04f74d88731c10b..963dd5f16513276be27265b63829335f2e03587b 100644 (file)
--- a/src/modules/m_abbreviation.cpp
+++ b/src/modules/m_abbreviation.cpp
@@ -19,6 +19,12 @@
 
 #include "inspircd.h"
 
+enum
+{
+       // InspIRCd-specific.
+       ERR_AMBIGUOUSCOMMAND = 420
+};
+
 class ModuleAbbreviation : public Module
 {
  public:
@@ -29,10 +35,10 @@ class ModuleAbbreviation : public Module
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Provides the ability to abbreviate commands a-la BBC BASIC keywords.",VF_VENDOR);
+               return Version("Provides the ability to abbreviate commands a-la BBC BASIC keywords", VF_VENDOR);
        }
 
-       ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, LocalUser *user, bool validated, const std::string &original_line) CXX11_OVERRIDE
+       ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) CXX11_OVERRIDE
        {
                /* Command is already validated, has a length of 0, or last character is not a . */
                if (validated || command.empty() || *command.rbegin() != '.')
@@ -49,7 +55,7 @@ class ModuleAbbreviation : public Module
                        {
                                if (matchlist.length() > 450)
                                {
-                                       user->WriteNumeric(420, "Ambiguous abbreviation and too many possible matches.");
+                                       user->WriteNumeric(ERR_AMBIGUOUSCOMMAND, "Ambiguous abbreviation and too many possible matches.");
                                        return MOD_RES_DENY;
                                }
 
@@ -67,7 +73,7 @@ class ModuleAbbreviation : public Module
                /* Ambiguous command, list the matches */
                if (!matchlist.empty())
                {
-                       user->WriteNumeric(420, InspIRCd::Format("Ambiguous abbreviation, possible matches: %s%s", foundcommand.c_str(), matchlist.c_str()));
+                       user->WriteNumeric(ERR_AMBIGUOUSCOMMAND, InspIRCd::Format("Ambiguous abbreviation, possible matches: %s%s", foundcommand.c_str(), matchlist.c_str()));
                        return MOD_RES_DENY;
                }