Narrow the scope of iterators

Also make sure that it is visible at first glance that iterators are
not taken from temporaries.
This commit is contained in:
Urs Fleisch
2023-07-16 06:41:53 +02:00
parent c2c9e8989c
commit 77ab5e9689
17 changed files with 44 additions and 80 deletions

View File

@@ -74,8 +74,7 @@ namespace
if(::strlen(fileName) == 0)
return nullptr;
#endif
auto it = fileTypeResolvers.cbegin();
for(; it != fileTypeResolvers.cend(); ++it) {
for(auto it = fileTypeResolvers.cbegin(); it != fileTypeResolvers.cend(); ++it) {
File *file = (*it)->createFile(fileName, readAudioProperties, audioPropertiesStyle);
if(file)
return file;
@@ -87,10 +86,8 @@ namespace
File *detectByResolvers(IOStream* stream, bool readAudioProperties,
AudioProperties::ReadStyle audioPropertiesStyle)
{
for(auto it = fileTypeResolvers.cbegin();
it != fileTypeResolvers.cend(); ++it) {
if(auto streamResolver =
dynamic_cast<const FileRef::StreamTypeResolver*>(*it)) {
for(auto it = fileTypeResolvers.cbegin(); it != fileTypeResolvers.cend(); ++it) {
if(auto streamResolver = dynamic_cast<const FileRef::StreamTypeResolver*>(*it)) {
if(File *file = streamResolver->createFileFromStream(
stream, readAudioProperties, audioPropertiesStyle))
return file;