Style fixes, including:

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

diff --git a/source/libmarklin/locomotive.h b/source/libmarklin/locomotive.h
index 4188df5e809dd3cbf756dbfc4b070700a900c8d3..eae99f57dddfdb66e5f7183fa3fa52356a540e97 100644 (file)
--- a/source/libmarklin/locomotive.h
+++ b/source/libmarklin/locomotive.h
@@ -12,10 +12,18 @@ class Control;
 
 class Locomotive
 {
+private:
+       Control  &control;
+       unsigned addr;
+       unsigned speed;
+       bool     reverse;
+       unsigned funcs;
+
 public:
        sigc::signal<void, unsigned> signal_speed_changed;
 
        Locomotive(Control &, unsigned);
+
        void     set_speed(unsigned);
        void     set_reverse(bool);
        void     set_function(unsigned, bool);
@@ -25,12 +33,6 @@ public:
        bool     get_function(unsigned f) const { return (funcs>>f)&1; }
        void     refresh_status();
 private:
-       Control  &control;
-       unsigned addr;
-       unsigned speed;
-       bool     reverse;
-       unsigned funcs;
-
        void     send_command(bool);
        void     status_reply(Error, const std::string &);
        bool     reverse_timeout();