X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fdesigner.cpp;h=0effc933f8d110de8e1d52b4199fa290422ba562;hb=c06f3dde10411cd34aae026d8bf22b7771bdc3e0;hp=366a94839dc36ca46c2d97f867e3dd4b28f8bbfe;hpb=495c54e187ddbb7514c983e1829a69d82ccad5f3;p=r2c2.git

diff --git a/source/designer/designer.cpp b/source/designer/designer.cpp
index 366a948..0effc93 100644
--- a/source/designer/designer.cpp
+++ b/source/designer/designer.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of R²C²
-Copyright © 2006-2011 Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #include <signal.h>
 #include <algorithm>
 #include <cmath>
@@ -18,9 +11,9 @@ Distributed under the GPL
 #include <msp/gl/texture2d.h>
 #include <msp/input/keys.h>
 #include <msp/io/print.h>
-#include <msp/strings/codec.h>
+#include <msp/stringcodec/codec.h>
+#include <msp/stringcodec/utf8.h>
 #include <msp/strings/lexicalcast.h>
-#include <msp/strings/utf8.h>
 #include <msp/strings/utils.h>
 #include <msp/time/units.h>
 #include <msp/time/utils.h>
@@ -287,7 +280,7 @@ void Designer::add_selection_to_route()
 	{
 		cur_route->add_tracks(selection.get_tracks());
 	}
-	catch(const Exception &e)
+	catch(const exception &e)
 	{
 		lbl_status->set_text(e.what());
 	}
@@ -326,7 +319,7 @@ void Designer::add_selection_to_zone()
 	{
 		cur_zone->add_tracks(selection.get_tracks());
 	}
-	catch(const Exception &e)
+	catch(const exception &e)
 	{
 		lbl_status->set_text(e.what());
 	}
@@ -569,14 +562,14 @@ void Designer::update_track_icon(Track3D &track)
 	if(unsigned sid = track.get_track().get_sensor_id())
 	{
 		overlay->add_graphic(track, "sensor");
-		overlay->set_label(track, lexical_cast(sid));
+		overlay->set_label(track, lexical_cast<string>(sid));
 	}
 	else if(unsigned tid = track.get_track().get_turnout_id())
 	{
 		if(tid<0x800)
 		{
 			overlay->add_graphic(track, "turnout");
-			overlay->set_label(track, lexical_cast(tid));
+			overlay->set_label(track, lexical_cast<string>(tid));
 		}
 	}
 }