BasicLoader is now called ObjectLoader

diff --git a/source/libr2c2/catalogue.cpp b/source/libr2c2/catalogue.cpp
index 847045634a1927ea142020a1a54c9a2d43360d72..d86fac071383852f5f241784b9240226e9b5af51 100644 (file)
--- 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<Catalogue>(c)
+       DataFile::ObjectLoader<Catalogue>(c)
 {
        add("ballast_profile", &Loader::ballast_profile);
        add("gauge", &Loader::gauge);

diff --git a/source/libr2c2/catalogue.h b/source/libr2c2/catalogue.h
index 73ad4e8e5694949d2de20fd597df1b7cb7320fb4..c0c6674c2a028e9ae44adc76ffdbba92761306b8 100644 (file)
--- a/source/libr2c2/catalogue.h
+++ b/source/libr2c2/catalogue.h
@@ -2,7 +2,7 @@
 #define LIBR2C2_CATALOGUE_H_
 
 #include <map>
-#include <msp/datafile/loader.h>
+#include <msp/datafile/objectloader.h>
 #include "articlenumber.h"
 #include "layout.h"
 #include "profile.h"
@@ -15,7 +15,7 @@ class VehicleType;
 class Catalogue
 {
 public:
-       class Loader: public Msp::DataFile::BasicLoader<Catalogue>
+       class Loader: public Msp::DataFile::ObjectLoader<Catalogue>
        {
        public:
                Loader(Catalogue &);

diff --git a/source/libr2c2/layout.cpp b/source/libr2c2/layout.cpp
index dfa56df02a93ae4ce6b0dffaec99b003a0f2b05b..de61b1bca4d5eb7e7ed5593af108ee34a2709abb 100644 (file)
--- 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<Layout>(l),
+       DataFile::ObjectLoader<Layout>(l),
        new_tracks(false)
 {
        add("base",  &Layout::base);

diff --git a/source/libr2c2/layout.h b/source/libr2c2/layout.h
index 02a4654e2d8f6ea63000b183d662511960e1a620..b89cacb90b1d11a5c1279d0ff2c11b5f9f9ef464 100644 (file)
--- a/source/libr2c2/layout.h
+++ b/source/libr2c2/layout.h
@@ -3,7 +3,7 @@
 
 #include <set>
 #include <sigc++/sigc++.h>
-#include <msp/datafile/loader.h>
+#include <msp/datafile/objectloader.h>
 #include <msp/time/timestamp.h>
 #include "block.h"
 
@@ -22,7 +22,7 @@ class Zone;
 class Layout
 {
 public:
-       class Loader: public Msp::DataFile::BasicLoader<Layout>
+       class Loader: public Msp::DataFile::ObjectLoader<Layout>
        {
        private:
                bool new_tracks;

diff --git a/source/libr2c2/route.cpp b/source/libr2c2/route.cpp
index 820ce1e32dad1536cce73ec313edfe70de9780f2..be2eefc258ea8cfc7e135932e9ab325c1611ee96 100644 (file)
--- a/source/libr2c2/route.cpp
+++ b/source/libr2c2/route.cpp
@@ -419,7 +419,7 @@ Route *Route::find(const TrackIter &from, const set<Track *> &to)
 
 
 Route::Loader::Loader(Route &r):
-       DataFile::BasicLoader<Route>(r)
+       DataFile::ObjectLoader<Route>(r)
 {
        add("name",    &Route::name);
        add("turnout", &Loader::turnout);

diff --git a/source/libr2c2/route.h b/source/libr2c2/route.h
index 5ea86be167781d3f4ca4b400b5f20bb3207c5a3c..3ee7e5ead2306313d2afb293bae4b7931124f439 100644 (file)
--- a/source/libr2c2/route.h
+++ b/source/libr2c2/route.h
@@ -5,7 +5,7 @@
 #include <set>
 #include <string>
 #include <sigc++/trackable.h>
-#include <msp/datafile/loader.h>
+#include <msp/datafile/objectloader.h>
 
 namespace R2C2 {
 
@@ -39,7 +39,7 @@ class Route: public sigc::trackable
 public:
        typedef std::map<unsigned, int> TurnoutMap;
 
-       class Loader: public Msp::DataFile::BasicLoader<Route>
+       class Loader: public Msp::DataFile::ObjectLoader<Route>
        {
        private:
                TurnoutMap turnouts;

diff --git a/source/libr2c2/track.cpp b/source/libr2c2/track.cpp
index 2cb95186e6f32237a61b16e092a5eac279a7ba13..4d8a8fc2210371cc4d96746e77991ed05bef0891 100644 (file)
--- 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<Track>(t)
+       DataFile::ObjectLoader<Track>(t)
 {
        add("position",   &Loader::position);
        add("rotation",   &Track::rot);

diff --git a/source/libr2c2/track.h b/source/libr2c2/track.h
index 326c2e28e3d65fe479c4ddc1c2e694a79deae5e3..480b1a33d42abd072ea8cc6f1f59523b65c5d486 100644 (file)
--- a/source/libr2c2/track.h
+++ b/source/libr2c2/track.h
@@ -4,7 +4,7 @@
 #include <list>
 #include <set>
 #include <sigc++/trackable.h>
-#include <msp/datafile/loader.h>
+#include <msp/datafile/objectloader.h>
 #include "geometry.h"
 
 namespace R2C2 {
@@ -16,7 +16,7 @@ class TrackType;
 class Track: public sigc::trackable
 {
 public:
-       class Loader: public Msp::DataFile::BasicLoader<Track>
+       class Loader: public Msp::DataFile::ObjectLoader<Track>
        {
        public:
                Loader(Track &);

diff --git a/source/libr2c2/trackpart.cpp b/source/libr2c2/trackpart.cpp
index 2b3809dd7809d1b31bdea92ca5ca6e73a83430d0..8c0c2d0038fdf3a6cf7c1a50b0f747c46cf95208 100644 (file)
--- 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<TrackPart>(p)
+       Msp::DataFile::ObjectLoader<TrackPart>(p)
 {
        add("start",    &Loader::start);
        add("length",   &TrackPart::length);

diff --git a/source/libr2c2/trackpart.h b/source/libr2c2/trackpart.h
index 462290526eb6809bd2663304bbcd1a97cb2a1a75..687be4b9870d75e54abe162285297175801b56cf 100644 (file)
--- a/source/libr2c2/trackpart.h
+++ b/source/libr2c2/trackpart.h
@@ -1,7 +1,7 @@
 #ifndef LIBR2C2_TRACKPART_H_
 #define LIBR2C2_TRACKPART_H_
 
-#include <msp/datafile/loader.h>
+#include <msp/datafile/objectloader.h>
 #include "geometry.h"
 
 namespace R2C2 {
@@ -9,7 +9,7 @@ namespace R2C2 {
 class TrackPart
 {
 public:
-       class Loader: public Msp::DataFile::BasicLoader<TrackPart>
+       class Loader: public Msp::DataFile::ObjectLoader<TrackPart>
        {
        public:
                Loader(TrackPart &);

diff --git a/source/libr2c2/tracktype.cpp b/source/libr2c2/tracktype.cpp
index c7a6aef7ba70fa85bac12a2ac2c1ff1738cc6a6e..29bf47be5409d42eb79fbd9644fbf1a62e08e1bc 100644 (file)
--- 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<TrackType>(t),
+       Msp::DataFile::ObjectLoader<TrackType>(t),
        state_bits_set(false)
 {
        add("autofit_preference", &TrackType::autofit_preference);

diff --git a/source/libr2c2/tracktype.h b/source/libr2c2/tracktype.h
index cc0cc517bffbff9686c8c6cae3a41fc139bdcfe6..1b1c78ce998de86b736d252774643bce2346bfba 100644 (file)
--- a/source/libr2c2/tracktype.h
+++ b/source/libr2c2/tracktype.h
@@ -1,7 +1,7 @@
 #ifndef LIBR2C2_TRACKTYPE_H_
 #define LIBR2C2_TRACKTYPE_H_
 
-#include <msp/datafile/loader.h>
+#include <msp/datafile/objectloader.h>
 #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<TrackType>
+       class Loader: public Msp::DataFile::ObjectLoader<TrackType>
        {
        private:
                bool state_bits_set;

diff --git a/source/libr2c2/train.cpp b/source/libr2c2/train.cpp
index 099e7611c3fbe7c63c1da2a6d432acc8614228a0..f43969d1949b0729eed8ba9132fb1bb37125d23f 100644 (file)
--- 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<Train>(t),
+       DataFile::ObjectLoader<Train>(t),
        prev_block(0),
        blocks_valid(true)
 {

diff --git a/source/libr2c2/train.h b/source/libr2c2/train.h
index e5bc5d260c24dfab073a7e150ebc249c53127d69..f8f7bfb51159778549b02afed6de47fa38f98b23 100644 (file)
--- a/source/libr2c2/train.h
+++ b/source/libr2c2/train.h
@@ -3,6 +3,7 @@
 
 #include <sigc++/signal.h>
 #include <sigc++/trackable.h>
+#include <msp/datafile/objectloader.h>
 #include <msp/time/timestamp.h>
 #include "block.h"
 #include "blockiter.h"
@@ -21,7 +22,7 @@ class Zone;
 class Train: public sigc::trackable
 {
 public:
-       class Loader: public Msp::DataFile::BasicLoader<Train>
+       class Loader: public Msp::DataFile::ObjectLoader<Train>
        {
        private:
                Block *prev_block;