X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fconfig.cpp;h=afb86ea7b2b4ff15a676662ecde6eaf003db63b8;hb=0c83b922e56976a30506d9f8d43c9dcd38d573b5;hp=dd5cda148dea67a838e73d0d720fb47cdea6c966;hpb=8d7926359d2477a9928d7367678314bcbc1f6e81;p=builder.git

diff --git a/source/config.cpp b/source/config.cpp
index dd5cda1..afb86ea 100644
--- a/source/config.cpp
+++ b/source/config.cpp
@@ -1,14 +1,6 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2009  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
-#include <msp/core/except.h>
+#include <msp/core/maputils.h>
 #include <msp/fs/stat.h>
 #include <msp/fs/utils.h>
-#include <msp/io/except.h>
 #include <msp/io/file.h>
 #include <msp/io/print.h>
 #include <msp/time/utils.h>
@@ -31,11 +23,7 @@ void Config::add_option(const string &n, const string &v, const string &d)
 
 const Config::Option &Config::get_option(const string &name) const
 {
-	OptionMap::const_iterator i = options.find(name);
-	if(i==options.end())
-		throw KeyError("Unknown option", name);
-
-	return i->second;
+	return get_item(options, name);
 }
 
 bool Config::is_option(const string &name) const
@@ -52,7 +40,7 @@ void Config::select_last_profile()
 		in.getline(profile);
 		set_option("profile", profile);
 	}
-	catch(const IO::FileNotFound &)
+	catch(const IO::file_not_found &)
 	{ }
 
 	freeze_mtime = true;
@@ -137,13 +125,13 @@ void Config::load()
 	{
 		IO::BufferedFile in(fn.str());
 
-		mtime = Time::TimeStamp::from_unixtime(FS::stat(fn).st_mtime);
+		mtime = FS::stat(fn).get_modify_time();
 
 		DataFile::Parser parser(in, fn.str());
 		Loader loader(*this);
 		loader.load(parser);
 	}
-	catch(const IO::FileNotFound &)
+	catch(const IO::file_not_found &)
 	{ }
 }