X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcoremods%2Fcore_reloadmodule.cpp;h=9101442216465c477df8dbfe5911ff47729e1215;hb=5585654df265bc37d547fa7738e35cc7ae7dacbb;hp=0d01d9e856519a44c7fb9bd5c7fab2cfc33545a9;hpb=860f5cbf1ea159d7d1c3fce2364747a822c50461;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/coremods/core_reloadmodule.cpp b/src/coremods/core_reloadmodule.cpp
index 0d01d9e85..910144221 100644
--- 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);
@@ -601,7 +602,7 @@ class ReloadAction : public HandlerBase0<void>
 		ServerInstance->SNO->WriteGlobalSno('a', "RELOAD MODULE: %s %ssuccessfully reloaded", passedname.c_str(), result ? "" : "un");
 		User* user = ServerInstance->FindUUID(uuid);
 		if (user)
-			user->WriteNumeric(RPL_LOADEDMODULE, "%s :Module %ssuccessfully reloaded.", passedname.c_str(), result ? "" : "un");
+			user->WriteNumeric(RPL_LOADEDMODULE, passedname, InspIRCd::Format("Module %ssuccessfully reloaded.", (result ? "" : "un")));
 
 		ServerInstance->GlobalCulls.AddItem(this);
 	}
@@ -612,8 +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, "%s :You cannot reload core_reloadmodule.so (unload and load it)",
-			parameters[0].c_str());
+		user->WriteNumeric(RPL_LOADEDMODULE, parameters[0], "You cannot reload core_reloadmodule (unload and load it)");
 		return CMD_FAILURE;
 	}
 
@@ -627,7 +627,7 @@ CmdResult CommandReloadmodule::Handle (const std::vector<std::string>& parameter
 	}
 	else
 	{
-		user->WriteNumeric(RPL_LOADEDMODULE, "%s :Could not find module by that name", parameters[0].c_str());
+		user->WriteNumeric(RPL_LOADEDMODULE, parameters[0], "Could not find module by that name");
 		return CMD_FAILURE;
 	}
 }