X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fdesigner.cpp;h=07c2f785f5a68299d0023439e13c2904412f6edb;hb=72edbf54afe12b47bfe9c3a030d6c6ae695bda18;hp=230b46f1ba0df23888a27bd54d7dcd8774d64361;hpb=ce29d0ccf89840c9581314301de0ea2b5b261c43;p=r2c2.git

diff --git a/source/designer/designer.cpp b/source/designer/designer.cpp
index 230b46f..07c2f78 100644
--- a/source/designer/designer.cpp
+++ b/source/designer/designer.cpp
@@ -38,8 +38,6 @@ using namespace std;
 using namespace R2C2;
 using namespace Msp;
 
-Application::RegApp<Designer> Designer::reg;
-
 Designer::Designer(int argc, char **argv):
 	window(1280, 960),
 	ui_res("r2c2.res"),
@@ -280,7 +278,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());
 	}
@@ -319,7 +317,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());
 	}
@@ -562,14 +560,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));
 		}
 	}
 }