X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Froute.cpp;h=5b37fcc06f3f7d381ec63309d9450ffde7f9e558;hb=9969895eea7f12d43333f81ad10234dd2208b4ef;hp=a2e7ac8c4c2c5d00a18597185377e12e70a89861;hpb=5338eb7f88d2cc702237158bf160955c3a5d54df;p=r2c2.git diff --git a/source/libr2c2/route.cpp b/source/libr2c2/route.cpp index a2e7ac8..5b37fcc 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; @@ -263,6 +257,11 @@ void Route::save(list &st) const st.push_back((DataFile::Statement("turnout"), i->first, i->second)); } +DataFile::Statement Route::save_reference() const +{ + return (DataFile::Statement("route"), name); +} + Route *Route::find(const TrackIter &from, Track &to) { return create_route(from, TrackMatch(to)); @@ -287,7 +286,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 +315,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;