Use the new API for defining types in a collection

[r2c2.git] / source / designer / designer.cpp

diff --git a/source/designer/designer.cpp b/source/designer/designer.cpp
index d73ef70ba36833dc40cd485e412487a2dd261d17..07c2f785f5a68299d0023439e13c2904412f6edb 100644 (file)
--- 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"),
@@ -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));
                }
        }
 }