Fix memory leaks and other bad stuff

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

diff --git a/source/libmarklin/sensor.h b/source/libmarklin/sensor.h
index 930b15fff890be651f82cbe1a0453cfb19f7be1a..45749ea28c142fe338436c378681b94a41fd0735 100644 (file)
--- a/source/libmarklin/sensor.h
+++ b/source/libmarklin/sensor.h
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of the MSP Märklin suite
-Copyright © 2006-2008 Mikkosoft Productions, Mikko Rasa
+Copyright © 2007-2008  Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
@@ -19,20 +19,21 @@ class Control;
 
 class Sensor
 {
+public:
+       sigc::signal<void, bool> signal_state_changed;
+
 private:
-       Control  &control;
+       Control &control;
        unsigned addr;
-       bool     state;
+       bool state;
        Msp::Time::TimeStamp off_timeout;
 
 public:
-       sigc::signal<void, bool> signal_state_changed;
-
        Sensor(Control &, unsigned);
 
        unsigned get_address() const { return addr; }
-       bool     get_state() const   { return state; }
-       void     tick();
+       bool get_state() const { return state; }
+       void tick();
 private:
        void sensor_event(unsigned, bool);
 };