Move block reservation signal serialization to Layout

[r2c2.git] / source / libr2c2 / block.cpp

diff --git a/source/libr2c2/block.cpp b/source/libr2c2/block.cpp
index 7c0409d94588caa787f1c73d440189c69de68a0b..289c4e54f6bd14de4107f1e4246144e8438c168b 100644 (file)
--- a/source/libr2c2/block.cpp
+++ b/source/libr2c2/block.cpp
@@ -1,8 +1,8 @@
 #include <algorithm>
+#include <msp/core/raii.h>
 #include <msp/strings/format.h>
 #include <msp/time/units.h>
 #include "block.h"
-#include "driver.h"
 #include "layout.h"
 #include "route.h"
 #include "trackcircuit.h"
@@ -171,7 +171,7 @@ bool Block::reserve(Train *t)
        if(!t || !train)
        {
                train = t;
-               signal_reserved.emit(train);
+               signal_reserved.emit(t);
                return true;
        }
        else
@@ -212,6 +212,11 @@ void Block::determine_id()
        signal_name_changed.emit(name);
 }
 
+DataFile::Statement Block::save_reference() const
+{
+       return (DataFile::Statement("block"), id);
+}
+
 
 Block::Endpoint::Endpoint(Track *t, unsigned e):
        track(t),