X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fremote%2Fremote.h;h=875f25bbbdbf803d962bdece37ee1e568f148727;hb=ecd7af790bd3ab7c7e768f68968379e1feea56a9;hp=a4bfc428e7ed467797e90b59414ded97baf2a367;hpb=2fe7cbcb761487bc7409b93b372da6f8ab3c581e;p=r2c2.git

diff --git a/source/remote/remote.h b/source/remote/remote.h
index a4bfc42..875f25b 100644
--- a/source/remote/remote.h
+++ b/source/remote/remote.h
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of the MSP Märklin suite
-Copyright © 2009  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #ifndef REMOTE_H_
 #define REMOTE_H_
 
@@ -14,27 +7,29 @@ Distributed under the GPL
 #include <msp/core/application.h>
 #include "network/client.h"
 
+class MainPanel;
 class TrainPanel;
 
-class Remote: public Msp::Application
+class Remote: public Msp::RegisteredApplication<Remote>
 {
 private:
 	Msp::IO::EventDispatcher event_disp;
-	Marklin::Catalogue catalogue;
-	Marklin::Client client;
+	R2C2::Catalogue catalogue;
+	R2C2::Client client;
 	Gtk::Main gtk;
 	Gtk::Window window;
-	Gtk::Box *train_box;
+	Gtk::Box *panel_box;
+	MainPanel *main_panel;
 	std::vector<TrainPanel *> train_panels;
 
-	static Msp::Application::RegApp<Remote> reg;
-
 public:
 	Remote(int argc, char **argv);
+
+	const R2C2::Catalogue &get_catalogue() const { return catalogue; }
 private:
 	void tick();
 
-	void train_added(Marklin::NetTrain &);
+	void train_added(R2C2::NetTrain &);
 };
 
 #endif