From c06f3dde10411cd34aae026d8bf22b7771bdc3e0 Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Thu, 17 Jan 2013 14:19:14 +0200 Subject: [PATCH] Add target type to all lexical_casts --- source/3d/vehicletype.cpp | 6 +++--- source/designer/designer.cpp | 4 ++-- source/designer/trackproperties.cpp | 4 ++-- source/designer/zoneproperties.cpp | 2 +- source/engineer/trainproperties.cpp | 2 +- source/libr2c2/articlenumber.cpp | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/source/3d/vehicletype.cpp b/source/3d/vehicletype.cpp index 620e6d8..427c29f 100644 --- a/source/3d/vehicletype.cpp +++ b/source/3d/vehicletype.cpp @@ -100,9 +100,9 @@ GL::Object *VehicleType3D::get_object(const string &name) string kind = name.substr(1, colon-1); map params; - params["length"] = lexical_cast(type.get_length()*1000); - params["width"] = lexical_cast(type.get_width()*1000); - params["height"] = lexical_cast(type.get_height()*1000); + params["length"] = lexical_cast(type.get_length()*1000); + params["width"] = lexical_cast(type.get_width()*1000); + params["height"] = lexical_cast(type.get_height()*1000); if(colon!=string::npos) { string::size_type start = colon+1; diff --git a/source/designer/designer.cpp b/source/designer/designer.cpp index d73ef70..0effc93 100644 --- a/source/designer/designer.cpp +++ b/source/designer/designer.cpp @@ -562,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(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(tid)); } } } diff --git a/source/designer/trackproperties.cpp b/source/designer/trackproperties.cpp index 8d21bfc..cdb5cb0 100644 --- a/source/designer/trackproperties.cpp +++ b/source/designer/trackproperties.cpp @@ -43,7 +43,7 @@ TrackProperties::TrackProperties(const Selection &s): if(selection.size()==1) { if(unsigned tid = selection.get_track()->get_turnout_id()) - ent_turnout_id->set_text(lexical_cast(tid)); + ent_turnout_id->set_text(lexical_cast(tid)); } const set &tracks = selection.get_tracks(); @@ -60,7 +60,7 @@ TrackProperties::TrackProperties(const Selection &s): } if(sensor_id>=0) - ent_sensor_id->set_text(lexical_cast(sensor_id)); + ent_sensor_id->set_text(lexical_cast(sensor_id)); } void TrackProperties::on_response(int code) diff --git a/source/designer/zoneproperties.cpp b/source/designer/zoneproperties.cpp index 91b8868..63cda25 100644 --- a/source/designer/zoneproperties.cpp +++ b/source/designer/zoneproperties.cpp @@ -38,7 +38,7 @@ ZoneProperties::ZoneProperties(Zone &z): add(*(lbl = new GLtk::Label("Number"))); lbl->set_geometry(GLtk::Geometry(170, geom.h-95, 70, 20)); - add(*(ent_number = new GLtk::Entry(lexical_cast(zone.get_number())))); + add(*(ent_number = new GLtk::Entry(lexical_cast(zone.get_number())))); ent_number->set_geometry(GLtk::Geometry(240, geom.h-95, 50, 20)); GLtk::Button *btn; diff --git a/source/engineer/trainproperties.cpp b/source/engineer/trainproperties.cpp index 67e096a..3609235 100644 --- a/source/engineer/trainproperties.cpp +++ b/source/engineer/trainproperties.cpp @@ -87,7 +87,7 @@ TrainProperties::TrainProperties(Engineer &e, Train *t): if(train) { - ent_addr->set_text(lexical_cast(train->get_address())); + ent_addr->set_text(lexical_cast(train->get_address())); ent_name->set_text(train->get_name()); drp_priority->set_selected_index(train->get_priority()+2); diff --git a/source/libr2c2/articlenumber.cpp b/source/libr2c2/articlenumber.cpp index 6952ccb..dd19eb5 100644 --- a/source/libr2c2/articlenumber.cpp +++ b/source/libr2c2/articlenumber.cpp @@ -48,7 +48,7 @@ string ArticleNumber::str() const if(!result.empty()) result += '-'; - result += lexical_cast(i->number); + result += lexical_cast(i->number); if(i->letter) result += i->letter; } -- 2.45.2