Replace the chrome mode with a more useful progress display

[builder.git] / source / config.cpp

diff --git a/source/config.cpp b/source/config.cpp
index afa60e87e45f10fe3a0e0c9780e2c52c9a607741..0e8e6c2c742c29ea52ee887aed7b04f5472b0427 100644 (file)
--- a/source/config.cpp
+++ b/source/config.cpp
@@ -1,15 +1,22 @@
+/* $Id$
+
+This file is part of builder
+Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
+Distributed under the LGPL
+*/
+
 #include <fstream>
-#include <msp/error.h>
+#include <msp/core/error.h>
 #include <msp/path/utils.h>
 #include <msp/time/utils.h>
 #include "builder.h"
 #include "config.h"
-#include "package.h"
+#include "sourcepackage.h"
 
 using namespace std;
 using namespace Msp;
 
-Config::Config(Package &p):
+Config::Config(SourcePackage &p):
        package(p),
        freeze_mtime(false)
 { }
@@ -172,7 +179,7 @@ void Config::save() const
 
        ofstream out(fn.str().c_str());
        if(!out) return;
-       
+
        for(i=options.begin(); i!=options.end(); ++i)
                out<<"option \""<<i->second.name<<"\" \""<<i->second.value<<"\";\n";
 }
@@ -207,7 +214,7 @@ void Config::load()
        Path::stat(fn, st);
        mtime=Time::TimeStamp::from_unixtime(st.st_mtime);
 
-       Parser::Parser parser(in, fn.str());
+       DataFile::Parser parser(in, fn.str());
        Loader loader(*this);
        loader.load(parser);
 }