Use !empty() instead of 'size() > 0' when checking parameter count.

[user/henk/code/inspircd.git] / src / coremods / core_reloadmodule.cpp

diff --git a/src/coremods/core_reloadmodule.cpp b/src/coremods/core_reloadmodule.cpp
index 6fcec8ac20cbb0a0f55c13c73d5913320ade5639..9101442216465c477df8dbfe5911ff47729e1215 100644 (file)
--- a/src/coremods/core_reloadmodule.cpp
+++ b/src/coremods/core_reloadmodule.cpp
@@ -45,7 +45,7 @@ class CommandReloadmodule : public Command
         * @param user The user issuing the command
         * @return A value from CmdResult to indicate command success or failure.
         */
-       CmdResult Handle(const std::vector<std::string>& parameters, User *user);
+       CmdResult Handle(const std::vector<std::string>& parameters, User* user) CXX11_OVERRIDE;
 };
 
 namespace ReloadModule
@@ -353,7 +353,8 @@ void DataKeeper::SaveMemberData(Channel* chan, std::vector<OwnedModesExts>& memb
                for (size_t j = 0; j < handledmodes[MODETYPE_CHANNEL].size(); j++)
                {
                        ModeHandler* mh = handledmodes[MODETYPE_CHANNEL][j].mh;
-                       if ((mh->IsPrefixMode()) && (memb->hasMode(mh->GetModeChar())))
+                       const PrefixMode* const pm = mh->IsPrefixMode();
+                       if ((pm) && (memb->HasMode(pm)))
                                currdata.modelist.push_back(InstanceData(j, memb->user->uuid)); // Need to pass the user's uuid to the mode parser to set the mode later
                }
 
@@ -564,7 +565,7 @@ void DataKeeper::DoRestoreModules()
 
 } // namespace ReloadModule
 
-class ReloadAction : public HandlerBase0<void>
+class ReloadAction : public ActionBase
 {
        Module* const mod;
        const std::string uuid;
@@ -578,7 +579,7 @@ class ReloadAction : public HandlerBase0<void>
        {
        }
 
-       void Call()
+       void Call() CXX11_OVERRIDE
        {
                ReloadModule::DataKeeper datakeeper;
                datakeeper.Save(mod);
@@ -612,7 +613,7 @@ CmdResult CommandReloadmodule::Handle (const std::vector<std::string>& parameter
        Module* m = ServerInstance->Modules->Find(parameters[0]);
        if (m == creator)
        {
-               user->WriteNumeric(RPL_LOADEDMODULE, parameters[0], "You cannot reload core_reloadmodule.so (unload and load it)");
+               user->WriteNumeric(RPL_LOADEDMODULE, parameters[0], "You cannot reload core_reloadmodule (unload and load it)");
                return CMD_FAILURE;
        }