Mscellaneous adaptations to mspgl API changes

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

diff --git a/source/engineer/engineer.h b/source/engineer/engineer.h
index 4ca753e949f230b864acf266f3e07b2403c86294..85dc347937b1f7d55d1e7654186f3911a01bff48 100644 (file)
--- a/source/engineer/engineer.h
+++ b/source/engineer/engineer.h
@@ -1,15 +1,8 @@
-/* $Id$
-
-This file is part of R²C²
-Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #ifndef ENGINEER_H_
 #define ENGINEER_H_
 
 #include <msp/core/application.h>
-#include <msp/gbase/simplewindow.h>
+#include <msp/graphics/simplewindow.h>
 #include <msp/gl/camera.h>
 #include <msp/gl/light.h>
 #include <msp/gl/lighting.h>
@@ -28,7 +21,7 @@ class MainPanel;
 class TrainPanel;
 class TrainView;
 
-class Engineer: public Msp::Application
+class Engineer: public Msp::RegisteredApplication<Engineer>
 {
 public:
        sigc::signal<void, R2C2::Track *, int> signal_pick_done;
@@ -92,11 +85,9 @@ private:
        void reset_block_color(const R2C2::Block &);
        void sensor_event(unsigned, bool);
        void block_reserved(const R2C2::Block &, const R2C2::Train *);
-       R2C2::Track3D *pick_track(int, int);
+       R2C2::Track *pick_track(int, int);
        void train_added(R2C2::Train &);
        virtual void sighandler(int);
-
-       static Msp::Application::RegApp<Engineer> reg;
 };
 
 #endif