From: Mikko Rasa <tdb@tdb.fi>
Date: Sun, 22 Jul 2012 17:08:36 +0000 (+0300)
Subject: Adjust some identifiers
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=16a068a97326d550aa52ba76beac72d1e9eb2461;p=builder.git

Adjust some identifiers
---

diff --git a/source/packagemanager.cpp b/source/packagemanager.cpp
index 7f18638..1a481fb 100644
--- 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))