mirror/nzbget
1
0
Fork 0
mirror of https://github.com/nzbget/nzbget.git synced 2026-04-25 15:26:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

#154: use lambdas when searching in containers

Browse Source
This commit is contained in:
Andrey Prygunkov
2016-01-14 19:43:33 +01:00
parent 0ee644d252
commit 421de1013f
2 changed files with 7 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
daemon/extension/ScriptConfig.cpp
View File

@@ -55,21 +55,6 @@ ScriptConfig::Script::Script(const char* name, const char* location)
}
ScriptConfig::Scripts::iterator ScriptConfig::Scripts::Find(const char* name)
{
for (iterator it = begin(); it != end(); it++)
{
Script& script = *it;
if (!strcmp(script.GetName(), name))
{
return it;
}
}
return end();
}
ScriptConfig::ScriptConfig()
{
InitScripts();
@@ -286,7 +271,12 @@ void ScriptConfig::LoadScripts(Scripts* scripts)
Tokenizer tok(g_Options->GetScriptOrder(), ",;");
while (const char* scriptName = tok.Next())
{
Scripts::iterator pos = tmpScripts.Find(scriptName);
Scripts::iterator pos = std::find_if(tmpScripts.begin(), tmpScripts.end(),
[scriptName](Script& script)
{
return !strcmp(script.GetName(), scriptName);
});
if (pos != tmpScripts.end())
{
scripts->splice(scripts->end(), tmpScripts, pos);