Un-abbreviate some function and variable names

[builder.git] / source / csourcefile.cpp

diff --git a/source/csourcefile.cpp b/source/csourcefile.cpp
index b0346e46cd01d94dc5d57ef01daf2823f8bb37cb..5628e04adb0aed6310b015c2d0c228cac8c40f10 100644 (file)
--- a/source/csourcefile.cpp
+++ b/source/csourcefile.cpp
@@ -22,17 +22,17 @@ CSourceFile::CSourceFile(Builder &b, const Component &c, const FS::Path &p):
                install_location = FS::Path("include")/package->get_name();
 }
 
-void CSourceFile::find_depends()
+void CSourceFile::find_dependencies()
 {
        if(!component || !mtime)
                return;
 
        const SourcePackage &spkg = component->get_package();
-       string relname = FS::relative(path, spkg.get_source()).str();
+       string deps_key = FS::relative(path, spkg.get_source_directory()).str();
 
-       DependencyCache &deps_cache = spkg.get_deps_cache();
-       if(mtime<deps_cache.get_mtime() && deps_cache.has_deps(relname))
-               includes = deps_cache.get_deps(relname);
+       DependencyCache &deps_cache = spkg.get_dependency_cache();
+       if(mtime<deps_cache.get_mtime() && deps_cache.has_deps(deps_key))
+               includes = deps_cache.get_deps(deps_key);
        else
        {
                IO::BufferedFile in(path.str());
@@ -46,7 +46,7 @@ void CSourceFile::find_depends()
                        if(RegMatch match = r_include.match(line))
                                includes.push_back(match[1].str);
 
-               deps_cache.set_deps(relname, includes);
+               deps_cache.set_deps(deps_key, includes);
        }
 
        const BuildInfo::PathList &incpath = component->get_build_info().incpath;
@@ -57,6 +57,6 @@ void CSourceFile::find_depends()
        {
                Target *hdr = builder.get_vfs().find_header(i->substr(1), ((*i)[0]=='"' ? local_incpath : incpath));
                if(hdr)
-                       add_depend(*hdr);
+                       add_dependency(*hdr);
        }
 }