Rename Section to Block for a closer match with real railway terminology

[r2c2.git] / source / libmarklin / train.h

diff --git a/source/libmarklin/train.h b/source/libmarklin/train.h
index 363fb5572c9184dde7a64e339815f3fbe4f28983..96f487066fb7e6ef5affa1228d8502c2fe35e5fb 100644 (file)
--- a/source/libmarklin/train.h
+++ b/source/libmarklin/train.h
@@ -2,7 +2,7 @@
 #define LIBMARKLIN_TRAIN_H_
 
 #include <sigc++/trackable.h>
-#include "section.h"
+#include "block.h"
 
 namespace Marklin {
 
@@ -15,24 +15,24 @@ public:
        Train(TrafficManager &, Locomotive &);
        const std::string &get_name() const { return name; }
        void set_speed(unsigned);
-       void place(Section *, const Section::Endpoint *);
-       bool free_section(Section *);
+       void place(Block *, const Block::Endpoint *);
+       bool free_block(Block *);
        void tick();
 private:
-       struct SectionRef
+       struct BlockRef
        {
-               Section *section;
-               const Section::Endpoint *entry;
+               Block *block;
+               const Block::Endpoint *entry;
 
-               SectionRef(Section *s, const Section::Endpoint *e): section(s), entry(e) { }
+               BlockRef(Block *s, const Block::Endpoint *e): block(s), entry(e) { }
        };
-       typedef std::list<SectionRef> SectRefSeq;
+       typedef std::list<BlockRef> BlockRefSeq;
 
        TrafficManager &trfc_mgr;
        std::string name;
        Locomotive &loco;
-       SectRefSeq cur_sections;
-       SectRefSeq rsv_sections;
+       BlockRefSeq cur_blocks;
+       BlockRefSeq rsv_blocks;
        unsigned target_speed;
 
        void sensor_event(unsigned, bool);