From: Mikko Rasa Date: Thu, 17 Jan 2013 12:25:27 +0000 (+0200) Subject: BasicLoader is now called ObjectLoader X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=64340dad429ba4040538fc06b6882aabdb489925;p=r2c2.git BasicLoader is now called ObjectLoader --- diff --git a/source/libr2c2/catalogue.cpp b/source/libr2c2/catalogue.cpp index 8470456..d86fac0 100644 --- a/source/libr2c2/catalogue.cpp +++ b/source/libr2c2/catalogue.cpp @@ -53,7 +53,7 @@ const VehicleType &Catalogue::get_vehicle(const ArticleNumber &art_nr) const Catalogue::Loader::Loader(Catalogue &c): - DataFile::BasicLoader(c) + DataFile::ObjectLoader(c) { add("ballast_profile", &Loader::ballast_profile); add("gauge", &Loader::gauge); diff --git a/source/libr2c2/catalogue.h b/source/libr2c2/catalogue.h index 73ad4e8..c0c6674 100644 --- a/source/libr2c2/catalogue.h +++ b/source/libr2c2/catalogue.h @@ -2,7 +2,7 @@ #define LIBR2C2_CATALOGUE_H_ #include -#include +#include #include "articlenumber.h" #include "layout.h" #include "profile.h" @@ -15,7 +15,7 @@ class VehicleType; class Catalogue { public: - class Loader: public Msp::DataFile::BasicLoader + class Loader: public Msp::DataFile::ObjectLoader { public: Loader(Catalogue &); diff --git a/source/libr2c2/layout.cpp b/source/libr2c2/layout.cpp index dfa56df..de61b1b 100644 --- a/source/libr2c2/layout.cpp +++ b/source/libr2c2/layout.cpp @@ -344,7 +344,7 @@ void Layout::block_state_changed(Block &block, Block::State state) Layout::Loader::Loader(Layout &l): - DataFile::BasicLoader(l), + DataFile::ObjectLoader(l), new_tracks(false) { add("base", &Layout::base); diff --git a/source/libr2c2/layout.h b/source/libr2c2/layout.h index 02a4654..b89cacb 100644 --- a/source/libr2c2/layout.h +++ b/source/libr2c2/layout.h @@ -3,7 +3,7 @@ #include #include -#include +#include #include #include "block.h" @@ -22,7 +22,7 @@ class Zone; class Layout { public: - class Loader: public Msp::DataFile::BasicLoader + class Loader: public Msp::DataFile::ObjectLoader { private: bool new_tracks; diff --git a/source/libr2c2/route.cpp b/source/libr2c2/route.cpp index 820ce1e..be2eefc 100644 --- a/source/libr2c2/route.cpp +++ b/source/libr2c2/route.cpp @@ -419,7 +419,7 @@ Route *Route::find(const TrackIter &from, const set &to) Route::Loader::Loader(Route &r): - DataFile::BasicLoader(r) + DataFile::ObjectLoader(r) { add("name", &Route::name); add("turnout", &Loader::turnout); diff --git a/source/libr2c2/route.h b/source/libr2c2/route.h index 5ea86be..3ee7e5e 100644 --- a/source/libr2c2/route.h +++ b/source/libr2c2/route.h @@ -5,7 +5,7 @@ #include #include #include -#include +#include namespace R2C2 { @@ -39,7 +39,7 @@ class Route: public sigc::trackable public: typedef std::map TurnoutMap; - class Loader: public Msp::DataFile::BasicLoader + class Loader: public Msp::DataFile::ObjectLoader { private: TurnoutMap turnouts; diff --git a/source/libr2c2/track.cpp b/source/libr2c2/track.cpp index 2cb9518..4d8a8fc 100644 --- a/source/libr2c2/track.cpp +++ b/source/libr2c2/track.cpp @@ -366,7 +366,7 @@ void Track::turnout_event(unsigned addr, unsigned state) Track::Loader::Loader(Track &t): - DataFile::BasicLoader(t) + DataFile::ObjectLoader(t) { add("position", &Loader::position); add("rotation", &Track::rot); diff --git a/source/libr2c2/track.h b/source/libr2c2/track.h index 326c2e2..480b1a3 100644 --- a/source/libr2c2/track.h +++ b/source/libr2c2/track.h @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include "geometry.h" namespace R2C2 { @@ -16,7 +16,7 @@ class TrackType; class Track: public sigc::trackable { public: - class Loader: public Msp::DataFile::BasicLoader + class Loader: public Msp::DataFile::ObjectLoader { public: Loader(Track &); diff --git a/source/libr2c2/trackpart.cpp b/source/libr2c2/trackpart.cpp index 2b3809d..8c0c2d0 100644 --- a/source/libr2c2/trackpart.cpp +++ b/source/libr2c2/trackpart.cpp @@ -114,7 +114,7 @@ bool TrackPart::collide_ray(const Vector &start, const Vector &ray, float width) TrackPart::Loader::Loader(TrackPart &p): - Msp::DataFile::BasicLoader(p) + Msp::DataFile::ObjectLoader(p) { add("start", &Loader::start); add("length", &TrackPart::length); diff --git a/source/libr2c2/trackpart.h b/source/libr2c2/trackpart.h index 4622905..687be4b 100644 --- a/source/libr2c2/trackpart.h +++ b/source/libr2c2/trackpart.h @@ -1,7 +1,7 @@ #ifndef LIBR2C2_TRACKPART_H_ #define LIBR2C2_TRACKPART_H_ -#include +#include #include "geometry.h" namespace R2C2 { @@ -9,7 +9,7 @@ namespace R2C2 { class TrackPart { public: - class Loader: public Msp::DataFile::BasicLoader + class Loader: public Msp::DataFile::ObjectLoader { public: Loader(TrackPart &); diff --git a/source/libr2c2/tracktype.cpp b/source/libr2c2/tracktype.cpp index c7a6aef..29bf47b 100644 --- a/source/libr2c2/tracktype.cpp +++ b/source/libr2c2/tracktype.cpp @@ -173,7 +173,7 @@ TrackType::Endpoint::Endpoint(float x, float y, float d, unsigned p): TrackType::Loader::Loader(TrackType &t): - Msp::DataFile::BasicLoader(t), + Msp::DataFile::ObjectLoader(t), state_bits_set(false) { add("autofit_preference", &TrackType::autofit_preference); diff --git a/source/libr2c2/tracktype.h b/source/libr2c2/tracktype.h index cc0cc51..1b1c78c 100644 --- a/source/libr2c2/tracktype.h +++ b/source/libr2c2/tracktype.h @@ -1,7 +1,7 @@ #ifndef LIBR2C2_TRACKTYPE_H_ #define LIBR2C2_TRACKTYPE_H_ -#include +#include #include "articlenumber.h" #include "geometry.h" #include "trackpart.h" @@ -20,7 +20,7 @@ public: Endpoint(float, float, float, unsigned); }; - class Loader: public Msp::DataFile::BasicLoader + class Loader: public Msp::DataFile::ObjectLoader { private: bool state_bits_set; diff --git a/source/libr2c2/train.cpp b/source/libr2c2/train.cpp index 099e761..f43969d 100644 --- a/source/libr2c2/train.cpp +++ b/source/libr2c2/train.cpp @@ -1289,7 +1289,7 @@ Train::RouteRef::RouteRef(const Route *r, unsigned d): Train::Loader::Loader(Train &t): - DataFile::BasicLoader(t), + DataFile::ObjectLoader(t), prev_block(0), blocks_valid(true) { diff --git a/source/libr2c2/train.h b/source/libr2c2/train.h index e5bc5d2..f8f7bfb 100644 --- a/source/libr2c2/train.h +++ b/source/libr2c2/train.h @@ -3,6 +3,7 @@ #include #include +#include #include #include "block.h" #include "blockiter.h" @@ -21,7 +22,7 @@ class Zone; class Train: public sigc::trackable { public: - class Loader: public Msp::DataFile::BasicLoader + class Loader: public Msp::DataFile::ObjectLoader { private: Block *prev_block;