From 8ba49db74e02f87c9c10c062906563f330b5fcf0 Mon Sep 17 00:00:00 2001 From: bofdahof <172177156+bofdahof@users.noreply.github.com> Date: Wed, 12 Mar 2025 17:46:52 +1000 Subject: [PATCH] Base: apply std::ranges --- src/Base/FileInfo.cpp | 2 +- src/Base/Reader.cpp | 3 +-- src/Base/Sequencer.cpp | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/Base/FileInfo.cpp b/src/Base/FileInfo.cpp index 1eed561992..a466d41ef2 100644 --- a/src/Base/FileInfo.cpp +++ b/src/Base/FileInfo.cpp @@ -333,7 +333,7 @@ bool FileInfo::hasExtension(const char* Ext) const bool FileInfo::hasExtension(std::initializer_list Exts) const { - return std::any_of(Exts.begin(), Exts.end(), [this](const char* ext) { + return std::ranges::any_of(Exts, [this](const char* ext) { return hasExtension(ext); }); } diff --git a/src/Base/Reader.cpp b/src/Base/Reader.cpp index b63a294d23..f9765d32e9 100644 --- a/src/Base/Reader.cpp +++ b/src/Base/Reader.cpp @@ -479,8 +479,7 @@ bool Base::XMLReader::hasFilenames() const bool Base::XMLReader::hasReadFailed(const std::string& filename) const { - auto it = std::find(FailedFiles.begin(), FailedFiles.end(), filename); - return (it != FailedFiles.end()); + return std::ranges::find(FailedFiles, filename) != FailedFiles.end(); } bool Base::XMLReader::isRegistered(Base::Persistence* Object) const diff --git a/src/Base/Sequencer.cpp b/src/Base/Sequencer.cpp index 6a9197d50a..82ae8c57f2 100644 --- a/src/Base/Sequencer.cpp +++ b/src/Base/Sequencer.cpp @@ -51,8 +51,7 @@ struct SequencerP } static void removeInstance(SequencerBase* sb) { - std::vector::iterator it; - it = std::find(_instances.begin(), _instances.end(), sb); + const auto it = std::ranges::find(_instances, sb); _instances.erase(it); } static SequencerBase& getInstance()