diff options
| author | glx22 <glx@openttd.org> | 2021-04-30 01:13:50 +0200 |
|---|---|---|
| committer | Loïc Guilloux <glx22@users.noreply.github.com> | 2021-05-03 19:46:57 +0200 |
| commit | 34215f7faa2de08d767b4f6945443a8f3175acbf (patch) | |
| tree | bcef64fe4b46afb04f4d4b6e0379c6386accbda1 /src/fileio.cpp | |
| parent | 7bcc472f73c774163285f71c235852ba0911e88e (diff) | |
| download | openttd-34215f7faa2de08d767b4f6945443a8f3175acbf.tar.xz | |
Codechange: Replace FOR_ALL_TARS with range-based for loops
Diffstat (limited to 'src/fileio.cpp')
| -rw-r--r-- | src/fileio.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/fileio.cpp b/src/fileio.cpp index f2a2b14f3..651fddff9 100644 --- a/src/fileio.cpp +++ b/src/fileio.cpp @@ -1345,12 +1345,12 @@ static uint ScanPath(FileScanner *fs, const char *extension, const char *path, s * @param extension the extension of files to search for. * @param tar the tar to search in. */ -static uint ScanTar(FileScanner *fs, const char *extension, TarFileList::iterator tar) +static uint ScanTar(FileScanner *fs, const char *extension, const TarFileList::value_type &tar) { uint num = 0; - const auto &filename = (*tar).first; + const auto &filename = tar.first; - if (MatchesExtension(extension, filename.c_str()) && fs->AddFile(filename, 0, (*tar).second.tar_filename)) num++; + if (MatchesExtension(extension, filename.c_str()) && fs->AddFile(filename, 0, tar.second.tar_filename)) num++; return num; } @@ -1369,7 +1369,6 @@ uint FileScanner::Scan(const char *extension, Subdirectory sd, bool tars, bool r this->subdir = sd; Searchpath sp; - TarFileList::iterator tar; uint num = 0; FOR_ALL_SEARCHPATHS(sp) { @@ -1381,7 +1380,7 @@ uint FileScanner::Scan(const char *extension, Subdirectory sd, bool tars, bool r } if (tars && sd != NO_DIRECTORY) { - FOR_ALL_TARS(tar, sd) { + for (const auto &tar : _tar_filelist[sd]) { num += ScanTar(this, extension, tar); } } |