X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcefile.cpp;h=062665c22d2fda44636d1c591eba55a3c01deb8e;hb=51d5a0f618faabfce9a0a5d5dd64b0b0d52b97cb;hp=d95ea5edc5f3678d1f1c0eb1926a50866ab22311;hpb=75bdcf13fbd285e2006337ec606ca28fa4ddae9e;p=builder.git

diff --git a/source/sourcefile.cpp b/source/sourcefile.cpp
index d95ea5e..062665c 100644
--- a/source/sourcefile.cpp
+++ b/source/sourcefile.cpp
@@ -1,12 +1,5 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2009  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
+#include <msp/core/maputils.h>
 #include <msp/fs/utils.h>
-#include <msp/io/except.h>
 #include <msp/io/print.h>
 #include <msp/strings/regex.h>
 #include "builder.h"
@@ -46,7 +39,7 @@ void SourceFile::find_depends()
 			includes = deps_cache.get_deps(relname);
 			deps_found = true;
 		}
-		catch(const KeyError &)
+		catch(const key_error &)
 		{ }
 	}
 
@@ -68,7 +61,7 @@ void SourceFile::find_depends()
 
 			deps_cache.set_deps(relname, includes);
 		}
-		catch(const IO::FileNotFound &)
+		catch(const IO::file_not_found &)
 		{
 			if(builder.get_verbose()>=4)
 				IO::print("Failed to read includes from %s\n", path.str());
@@ -82,7 +75,7 @@ void SourceFile::find_depends()
 	FS::Path dir = FS::dirname(path);
 	for(list<string>::iterator i=includes.begin(); i!=includes.end(); ++i)
 	{
-		Target *hdr = builder.get_header(*i, dir, incpath);
+		Target *hdr = builder.get_vfs().find_header(*i, dir, incpath);
 		if(hdr)
 			add_depend(hdr);
 	}