Further changes for library compatibility

[builder.git] / source / config.cpp

diff --git a/source/config.cpp b/source/config.cpp
index dd5cda148dea67a838e73d0d720fb47cdea6c966..87573e22360d5a765a12e5412616364b6f0ffa18 100644 (file)
--- a/source/config.cpp
+++ b/source/config.cpp
@@ -5,10 +5,9 @@ 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 +30,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 +47,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 +132,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 &)
        { }
 }