Replace basic for loops with range-based loops or algorithms

[builder.git] / source / packagemanager.cpp

diff --git a/source/packagemanager.cpp b/source/packagemanager.cpp
index 35c752e8e4e056d979e1b55d536f94e66219ea04..f54606f42f1639e09b0e91e11a2b02ecbfd15593 100644 (file)
--- a/source/packagemanager.cpp
+++ b/source/packagemanager.cpp
@@ -1,4 +1,5 @@
 #include <cstdlib>
+#include <msp/core/algorithm.h>
 #include <msp/fs/dir.h>
 #include <msp/fs/stat.h>
 #include <msp/fs/utils.h>
@@ -25,8 +26,8 @@ PackageManager::PackageManager(Builder &b):
 
 PackageManager::~PackageManager()
 {
-       for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i)
-               delete i->second;
+       for(const auto &kvp: packages)
+               delete kvp.second;
 }
 
 void PackageManager::append_package_path(const FS::Path &p)
@@ -135,10 +136,7 @@ string PackageManager::run_pkgconfig(const string &pkg, const string &what)
                        if(const char *pcp = getenv("PKG_CONFIG_PATH"))
                        {
                                vector<string> path = split(pcp, ':');
-                               bool found = false;
-                               for(vector<string>::const_iterator i=path.begin(); (!found && i!=path.end()); ++i)
-                                       found = (*i==pcdir.str());
-                               if(!found)
+                               if(!any_equals(path, pcdir.str()))
                                {
                                        path.push_back(pcdir.str());
                                        setenv("PKG_CONFIG_PATH", join(path.begin(), path.end(), ":").c_str(), true);
@@ -190,14 +188,13 @@ FS::Path PackageManager::get_package_location(const string &name)
 
        if(pkg_dirs.empty())
        {
-               for(SearchPath::const_iterator i=pkg_path.begin(); i!=pkg_path.end(); ++i)
+               for(const FS::Path &p: pkg_path)
                {
-                       builder.get_logger().log("files", format("Traversing %s", *i));
-                       vector<string> files = list_files(*i);
+                       builder.get_logger().log("files", format("Traversing %s", p));
                        unsigned count = 0;
-                       for(vector<string>::const_iterator j=files.begin(); j!=files.end(); ++j)
+                       for(const string &f: list_files(p))
                        {
-                               FS::Path full = *i / *j;
+                               FS::Path full = p/f;
                                if(FS::exists(full/"Build"))
                                {
                                        pkg_dirs.push_back(full);
@@ -205,22 +202,22 @@ FS::Path PackageManager::get_package_location(const string &name)
                                }
                        }
 
-                       builder.get_logger().log("packagemgr", format("%d source packages found in %s", count, *i));
+                       builder.get_logger().log("packagemgr", format("%d source packages found in %s", count, p));
                }
 
                builder.get_logger().log("packagemgr", format("%d source packages found", pkg_dirs.size()));
        }
 
        bool msp = !name.compare(0, 3, "msp");
-       for(SearchPath::const_iterator i=pkg_dirs.begin(); i!=pkg_dirs.end(); ++i)
+       for(const FS::Path &p: pkg_dirs)
        {
-               string base = FS::basename(*i);
+               string base = FS::basename(p);
                unsigned dash = base.rfind('-');
 
                if(!base.compare(0, dash, name))
-                       return *i;
+                       return p;
                else if(msp && !base.compare(0, dash, name, 3, string::npos))
-                       return *i;
+                       return p;
        }
 
        return FS::Path();
@@ -232,30 +229,27 @@ FS::Path PackageManager::get_binary_package_file(const string &name)
 
        if(binpkg_files.empty())
        {
-               for(list<FS::Path>::const_iterator i=binpkg_path.begin(); i!=binpkg_path.end(); ++i)
+               for(const FS::Path &p: binpkg_path)
                {
-                       builder.get_logger().log("files", format("Traversing %s", *i));
-                       vector<string> files = list_filtered(*i, "\\.bpk$");
-                       for(vector<string>::const_iterator j=files.begin(); j!=files.end(); ++j)
-                               binpkg_files.push_back(*i / *j);
-                       builder.get_logger().log("packagemgr", format("%d binary packages found in %s", files.size(), *i));
+                       builder.get_logger().log("files", format("Traversing %s", p));
+                       vector<string> files = list_filtered(p, "\\.bpk$");
+                       for(const string &f: files)
+                               binpkg_files.push_back(p/f);
+                       builder.get_logger().log("packagemgr", format("%d binary packages found in %s", files.size(), p));
                }
 
                builder.get_logger().log("packagemgr", format("%d binary packages found", binpkg_files.size()));
        }
 
-       for(SearchPath::const_iterator i=binpkg_files.begin(); i!=binpkg_files.end(); ++i)
-       {
-               string base = FS::basepart(FS::basename(*i));
-               if(base==name)
-                       return *i;
-       }
+       auto i = find_if(binpkg_files, [&name](const FS::Path &p){ return FS::basepart(FS::basename(p))==name; });
+       if(i!=binpkg_files.end())
+               return *i;
 
        return FS::Path();
 }
 
 void PackageManager::save_all_caches() const
 {
-       for(PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i)
-               i->second->save_caches();
+       for(const auto &kvp: packages)
+               kvp.second->save_caches();
 }