Use default member initializers and constructor delegation

[builder.git] / source / config.cpp

diff --git a/source/config.cpp b/source/config.cpp
index 67f932fbafe9fa29fc06d0a0637027badb42e8a4..48864a9fac64f8fb33d7f4143acac3cb1a27c5ba 100644 (file)
--- a/source/config.cpp
+++ b/source/config.cpp
@@ -1,4 +1,5 @@
 #include <msp/core/maputils.h>
+#include <msp/datafile/writer.h>
 #include <msp/fs/stat.h>
 #include <msp/fs/utils.h>
 #include <msp/io/file.h>
@@ -12,8 +13,7 @@ using namespace std;
 using namespace Msp;
 
 Config::Config(SourcePackage &p):
-       package(p),
-       changed(false)
+       package(p)
 { }
 
 const Config::Option &Config::add_option(const Feature &f)
@@ -61,7 +61,7 @@ void Config::load()
        FS::Stat stat = FS::stat(fn);
        if(stat)
        {
-               package.get_builder().get_logger().log("files", format("Reading %s", fn));
+               package.get_builder().get_logger().log("files", "Reading %s", fn);
                IO::BufferedFile in(fn.str());
 
                mtime = stat.get_modify_time();
@@ -79,11 +79,12 @@ void Config::save() const
 
        FS::Path fn = package.get_source_directory()/".config";
 
-       package.get_builder().get_logger().log("files", format("Writing %s", fn));
+       package.get_builder().get_logger().log("files", "Writing %s", fn);
        IO::BufferedFile out(fn.str(), IO::M_WRITE);
+       DataFile::Writer writer(out);
 
        for(const auto &kvp: options)
-               IO::print(out, "option \"%s\" \"%s\";\n", kvp.second.name, kvp.second.value);
+               writer.write((DataFile::Statement("option"), kvp.second.name, kvp.second.value));
 
        changed = false;
 }