Replace basic for loops with range-based loops or algorithms

[builder.git] / source / pkgconfiggenerator.cpp

diff --git a/source/pkgconfiggenerator.cpp b/source/pkgconfiggenerator.cpp
index 949a4df589747e7da8b64ec0cc39f53544ba8db0..e9320448b3508a201676eb783ddf2b8d73b87cd2 100644 (file)
--- a/source/pkgconfiggenerator.cpp
+++ b/source/pkgconfiggenerator.cpp
@@ -44,30 +44,29 @@ void PkgConfigGenerator::Worker::main()
        IO::print(out, "Version: %s\n", spkg.get_version());
 
        IO::print(out, "Requires:");
-       const Package::Requirements &reqs = spkg.get_required_packages();
-       for(Package::Requirements::const_iterator i=reqs.begin(); i!=reqs.end(); ++i)
-               if((*i)->uses_pkgconfig())
-                       IO::print(out, " %s", (*i)->get_name());
+       for(const Package *r: spkg.get_required_packages())
+               if(r->uses_pkgconfig())
+                       IO::print(out, " %s", r->get_name());
        out.put('\n');
 
        const BuildInfo &binfo = spkg.get_exported_build_info();
        IO::print(out, "Libs:");
-       for(BuildInfo::PathList::const_iterator i=binfo.libpath.begin(); i!=binfo.libpath.end(); ++i)
-               IO::print(out, " -L%s", prefixify(*i, builder.get_prefix()));
-       for(BuildInfo::WordList::const_iterator i=binfo.libs.begin(); i!=binfo.libs.end(); ++i)
-               IO::print(out, " -l%s", *i);
+       for(const FS::Path &p: binfo.libpath)
+               IO::print(out, " -L%s", prefixify(p, builder.get_prefix()));
+       for(const string &l: binfo.libs)
+               IO::print(out, " -l%s", l);
        if(binfo.threads)
                out.write("-pthread");
        out.put('\n');
 
        IO::print(out, "Cflags:");
-       for(BuildInfo::PathList::const_iterator i=binfo.incpath.begin(); i!=binfo.incpath.end(); ++i)
-               IO::print(out, " -I%s", prefixify(*i, builder.get_prefix()));
-       for(BuildInfo::DefineMap::const_iterator i=binfo.defines.begin(); i!=binfo.defines.end(); ++i)
-               if(i->second.empty())
-                       IO::print(out, " -D%s", i->first);
+       for(const FS::Path &p: binfo.incpath)
+               IO::print(out, " -I%s", prefixify(p, builder.get_prefix()));
+       for(const auto &kvp: binfo.defines)
+               if(kvp.second.empty())
+                       IO::print(out, " -D%s", kvp.first);
                else
-                       IO::print(out, " -D%s=%s", i->first, i->second);
+                       IO::print(out, " -D%s=%s", kvp.first, kvp.second);
        out.put('\n');
 
        status = Task::SUCCESS;