X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Flibr2c2%2Froute.cpp;fp=source%2Flibr2c2%2Froute.cpp;h=7458cc66e2eb87f57a08373d6dfc04041bc5680b;hb=1124a98ce5e1edee1904eeec089976d446601afd;hp=a2e7ac8c4c2c5d00a18597185377e12e70a89861;hpb=2ce3226c21dd0ab65a7abaf1cdcec36cc4c09dcc;p=r2c2.git diff --git a/source/libr2c2/route.cpp b/source/libr2c2/route.cpp index a2e7ac8..7458cc6 100644 --- a/source/libr2c2/route.cpp +++ b/source/libr2c2/route.cpp @@ -140,12 +140,6 @@ Route::~Route() layout.remove(*this); } -void Route::set_name(const string &n) -{ - name = n; - signal_name_changed.emit(name); -} - void Route::set_temporary(bool t) { temporary = t; @@ -287,7 +281,7 @@ Route *Route::find(const TrackIter &from, const set &to) Route::Loader::Loader(Route &r): DataFile::ObjectLoader(r) { - add("name", &Route::name); + add("name", &Loader::name); add("turnout", &Loader::turnout); } @@ -316,6 +310,11 @@ void Route::Loader::finish() } } +void Route::Loader::name(const string &n) +{ + obj.name = n; +} + void Route::Loader::turnout(unsigned id, unsigned path) { turnouts[id] = path;