X-Git-Url: http://git.tdb.fi/?p=libs%2Fdatafile.git;a=blobdiff_plain;f=source%2Fdirectorysource.cpp;h=e9f95fc830c9686997bc13088460c0da38847642;hp=207f30d0e31716c310f0927b82f5ba14fe456b6a;hb=256b44a5009467171af53316141277027bcc0ba4;hpb=7e81da8d9a6e689e271f4f0450a69d8a14f515bb

diff --git a/source/directorysource.cpp b/source/directorysource.cpp
index 207f30d..e9f95fc 100644
--- a/source/directorysource.cpp
+++ b/source/directorysource.cpp
@@ -10,12 +10,9 @@ namespace DataFile {
 
 void DirectorySource::add_directory(const FS::Path &d, bool replace)
 {
-	list<string> files = FS::list_files(d);
-	for(list<string>::const_iterator i=files.begin(); i!=files.end(); ++i)
-	{
-		if(!objects.count(*i) || replace)
-			objects[*i] = d / *i;
-	}
+	for(const string &f: FS::list_files(d))
+		if(!objects.count(f) || replace)
+			objects[f] = d/f;
 }
 
 bool DirectorySource::is_loadable(const CollectionItemTypeBase &, const string &name) const
@@ -26,9 +23,9 @@ bool DirectorySource::is_loadable(const CollectionItemTypeBase &, const string &
 CollectionSource::NameList DirectorySource::get_names(const CollectionItemTypeBase &type) const
 {
 	NameList names;
-	for(ObjectMap::const_iterator i=objects.begin(); i!=objects.end(); ++i)
-		if(type.match_name(i->first))
-			names.push_back(i->first);
+	for(const auto &kvp: objects)
+		if(type.match_name(kvp.first))
+			names.push_back(kvp.first);
 	return names;
 }