Un-abbreviate some function and variable names

[builder.git] / source / config.cpp

diff --git a/source/config.cpp b/source/config.cpp
index e4449cc80aaad3fe16c7b628f4708bdff5a80e30..f3110039e79e9c84b8e664e7f560d944a473c921 100644 (file)
--- a/source/config.cpp
+++ b/source/config.cpp
@@ -39,7 +39,7 @@ void Config::save() const
        if(!changed)
                return;
 
-       FS::Path fn = package.get_source()/".config";
+       FS::Path fn = package.get_source_directory()/".config";
 
        package.get_builder().get_logger().log("files", format("Writing %s", fn));
        IO::BufferedFile out(fn.str(), IO::M_WRITE);
@@ -68,7 +68,7 @@ bool Config::set_option(const string &opt, const string &val)
 
 void Config::load()
 {
-       FS::Path fn = package.get_source()/".config";
+       FS::Path fn = package.get_source_directory()/".config";
        FS::Stat stat = FS::stat(fn);
        if(stat)
        {
@@ -86,8 +86,8 @@ void Config::load()
 
 Config::Option::Option(const string &n, const string &v, const string &d):
        name(n),
-       defv(v),
-       descr(d),
+       default_value(v),
+       description(d),
        value(v)
 { }