Further adjustments to changes in GLtk

[r2c2.git] / source / engineer / trainpanel.h

diff --git a/source/engineer/trainpanel.h b/source/engineer/trainpanel.h
index d74ccbf88695e40c960a93c72975f9de31d33b97..1881035615699804e0ee41da624f5fe9a196e733 100644 (file)
--- a/source/engineer/trainpanel.h
+++ b/source/engineer/trainpanel.h
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of R²C²
-Copyright © 2006-2010  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #ifndef TRAINPANEL_H_
 #define TRAINPANEL_H_
 
@@ -16,6 +9,7 @@ Distributed under the GPL
 #include <msp/gltk/toggle.h>
 #include "libr2c2/route.h"
 #include "libr2c2/train.h"
+#include "libr2c2/trainstatus.h"
 
 class Engineer;
 
@@ -24,6 +18,7 @@ class TrainPanel: public Msp::GLtk::Panel, public sigc::trackable
 private:
        Engineer &engineer;
        R2C2::Train &train;
+       R2C2::TrainStatus status;
        Msp::GLtk::Panel *pnl_basic;
        Msp::GLtk::Panel *pnl_extra;
        Msp::GLtk::Button *btn_expand;
@@ -43,7 +38,7 @@ public:
        void expand(bool = true);
 
 private:
-       void train_control_changed(const std::string &, float);
+       void ai_event(const R2C2::TrainAI::Message &);
        void train_function_changed(unsigned, bool);
        void train_route_changed(const R2C2::Route *);
        void train_status_changed(const std::string &);
@@ -52,7 +47,6 @@ private:
        void edit_clicked();
        void route_clicked();
        void goto_clicked();
-       void timetable_clicked();
        void view_clicked();
        void expand_clicked();
        void speed_slider_changed(double);