X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_showfile.cpp;h=cb51c4387cbf5e2a264d4120a015aaa63b01bc9f;hb=0ec19b7ac91eedc83b31c3da733e237bfe28fc48;hp=0f5d3ed1a00c8e556239edb9ed3d12934da6abad;hpb=e244cb2c63b1ac1d85bdbb4691f7b1bd940ae804;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_showfile.cpp b/src/modules/m_showfile.cpp
index 0f5d3ed1a..cb51c4387 100644
--- a/src/modules/m_showfile.cpp
+++ b/src/modules/m_showfile.cpp
@@ -104,7 +104,7 @@ class ModuleShowFile : public Module
 		FileReader reader(file);
 
 		CommandShowFile* sfcmd;
-		Command* handler = ServerInstance->Parser->GetHandler(cmdname);
+		Command* handler = ServerInstance->Parser.GetHandler(cmdname);
 		if (handler)
 		{
 			// Command exists, check if it is ours
@@ -113,7 +113,7 @@ class ModuleShowFile : public Module
 
 			// This is our command, make sure we don't have the same entry twice
 			sfcmd = static_cast<CommandShowFile*>(handler);
-			if (std::find(newcmds.begin(), newcmds.end(), sfcmd) != newcmds.end())
+			if (stdalgo::isin(newcmds, sfcmd))
 				throw ModuleException("Command " + cmdname + " is already used in a <showfile> tag");
 		}
 		else
@@ -127,12 +127,6 @@ class ModuleShowFile : public Module
 		newcmds.push_back(sfcmd);
 	}
 
-	static void DelAll(const std::vector<CommandShowFile*>& list)
-	{
-		for (std::vector<CommandShowFile*>::const_iterator i = list.begin(); i != list.end(); ++i)
-			delete *i;
-	}
-
  public:
 	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
@@ -157,13 +151,13 @@ class ModuleShowFile : public Module
 		std::sort(newcmds.begin(), newcmds.end());
 		std::set_difference(cmds.begin(), cmds.end(), newcmds.begin(), newcmds.end(), removed.begin());
 
-		DelAll(removed);
+		stdalgo::delete_all(removed);
 		cmds.swap(newcmds);
 	}
 
 	~ModuleShowFile()
 	{
-		DelAll(cmds);
+		stdalgo::delete_all(cmds);
 	}
 
 	Version GetVersion() CXX11_OVERRIDE