Adjust some identifiers

diff --git a/source/packagemanager.cpp b/source/packagemanager.cpp
index 7f186382a3e76cf4b8a490095ec9c91f1e416ba4..1a481fb17925a86bf03a6a47b0871fa39ca6e953 100644 (file)
--- a/source/packagemanager.cpp
+++ b/source/packagemanager.cpp
@@ -163,7 +163,7 @@ FS::Path PackageManager::get_package_location(const string &name)
 
        if(pkg_dirs.empty())
        {
-               for(list<FS::Path>::const_iterator i=pkg_path.begin(); i!=pkg_path.end(); ++i)
+               for(SearchPath::const_iterator i=pkg_path.begin(); i!=pkg_path.end(); ++i)
                {
                        builder.get_logger().log("files", format("Traversing %s", *i));
                        list<string> files = list_files(*i);
@@ -185,9 +185,9 @@ FS::Path PackageManager::get_package_location(const string &name)
        }
 
        bool msp = !name.compare(0, 3, "msp");
-       for(list<FS::Path>::const_iterator i=pkg_dirs.begin(); i!=pkg_dirs.end(); ++i)
+       for(SearchPath::const_iterator i=pkg_dirs.begin(); i!=pkg_dirs.end(); ++i)
        {
-               string base = basename(*i);
+               string base = FS::basename(*i);
                unsigned dash = base.rfind('-');
 
                if(!base.compare(0, dash, name))