mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Refactoring: Use any_of(), all_of() or, none_of() instead of find_if() where possible

Browse source 
When the result of find_if() is only compared to the container's end(),
the operation can normally be expressed more concisely using any_of(),
all_of(), or none_of().
This commit is contained in:
reuk 2021-10-01 20:15:45 +01:00
parent c1cd432703
commit 4a3ea2721d
No known key found for this signature in database
GPG key ID: 9ADCD339CFC98A11
4 changed files with 27 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

4
extras/Projucer/Source/Project/Modules/jucer_AvailableModulesList.h
View file

@ -131,8 +131,8 @@ private:
ModuleDescription m (path);
if (m.isValid()
&& std::find_if (list.begin(), list.end(),
[&m] (const ModuleIDAndFolder& element) { return element.first == m.getID(); }) == std::end (list))
&& std::none_of (list.begin(), list.end(),
[&m] (const ModuleIDAndFolder& element) { return element.first == m.getID(); }))
{
list.push_back ({ m.getID(), path });
return true;

52
extras/Projucer/Source/Project/UI/jucer_ProjectMessagesComponent.h
View file

@ -299,42 +299,34 @@ private:
return true;
};
messages.erase (std::remove_if (std::begin (messages), std::end (messages), removePredicate),
std::end (messages));
messages.erase (std::remove_if (messages.begin(), messages.end(), removePredicate),
messages.end());
for (int i = 0; i < warningsTree.getNumChildren(); ++i)
for (auto* tree : { &warningsTree, &notificationsTree })
{
auto child = warningsTree.getChild (i);
if (! child.getProperty (ProjectMessages::Ids::isVisible))
continue;
if (std::find_if (std::begin (messages), std::end (messages),
[child] (const std::unique_ptr<MessageComponent>& messageComponent) { return messageComponent->message == child.getType(); })
== std::end (messages))
for (int i = 0; i < tree->getNumChildren(); ++i)
{
messages.push_back (std::make_unique<MessageComponent> (*this, child.getType(), project.getMessageActions (child.getType())));
addAndMakeVisible (*messages.back());
auto child = tree->getChild (i);
if (! child.getProperty (ProjectMessages::Ids::isVisible))
continue;
const auto messageMatchesType = [&child] (const auto& messageComponent)
{
return messageComponent->message == child.getType();
};
if (std::none_of (messages.begin(), messages.end(), messageMatchesType))
{
messages.push_back (std::make_unique<MessageComponent> (*this,
child.getType(),
project.getMessageActions (child.getType())));
addAndMakeVisible (*messages.back());
}
}
}
for (int i = 0; i < notificationsTree.getNumChildren(); ++i)
{
auto child = notificationsTree.getChild (i);
if (! child.getProperty (ProjectMessages::Ids::isVisible))
continue;
if (std::find_if (std::begin (messages), std::end (messages),
[child] (const std::unique_ptr<MessageComponent>& messageComponent) { return messageComponent->message == child.getType(); })
== std::end (messages))
{
messages.push_back (std::make_unique<MessageComponent> (*this, child.getType(), project.getMessageActions (child.getType())));
addAndMakeVisible (*messages.back());
}
}
auto isNowShowing = (messages.size() > 0);
const auto isNowShowing = (messages.size() > 0);
owner.updateBounds (isNowShowing != listWasShowing);
updateSize (owner.getWidth());

5
extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp
View file

@ -225,10 +225,7 @@ String ProjectExporter::getUniqueName() const
return defaultBuildsRootFolder + info.targetFolder == targetLocationString;
};
auto iter = std::find_if (typeInfos.begin(), typeInfos.end(),
std::move (predicate));
if (iter == typeInfos.end())
if (std::none_of (typeInfos.begin(), typeInfos.end(), std::move (predicate)))
return name + " - " + targetLocationString;
return name;

4
modules/juce_events/timers/juce_Timer.cpp
View file

@ -186,8 +186,8 @@ private:
{
// Trying to add a timer that's already here - shouldn't get to this point,
// so if you get this assertion, let me know!
jassert (std::find_if (timers.begin(), timers.end(),
[t] (TimerCountdown i) { return i.timer == t; }) == timers.end());
jassert (std::none_of (timers.begin(), timers.end(),
[t] (TimerCountdown i) { return i.timer == t; }));
auto pos = timers.size();