Strip Id tags and copyright notices from files

[r2c2.git] / source / remote / trainpanel.cpp

diff --git a/source/remote/trainpanel.cpp b/source/remote/trainpanel.cpp
index 7675b27f07e086c5ed6a258f2754598b9e4a2283..26963a0537d6200af841108449669d1eba32c31b 100644 (file)
--- a/source/remote/trainpanel.cpp
+++ b/source/remote/trainpanel.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of R²C²
-Copyright © 2009-2010  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #include <gtkmm/box.h>
 #include <gtkmm/liststore.h>
 #include "remote.h"
@@ -44,8 +37,8 @@ TrainPanel::TrainPanel(Remote &r, R2C2::Client &c, R2C2::NetTrain &t):
 
        Gtk::HBox *func_box = new Gtk::HBox(false, 5);
        vbox->add(*manage(func_box));
-       const std::map<unsigned, string> &funcs = train.get_loco_type().get_functions();
-       for(std::map<unsigned, string>::const_iterator i=funcs.begin(); i!=funcs.end(); ++i)
+       const R2C2::VehicleType::FunctionMap &funcs = train.get_loco_type().get_functions();
+       for(R2C2::VehicleType::FunctionMap::const_iterator i=funcs.begin(); i!=funcs.end(); ++i)
        {
                Gtk::CheckButton *&chk = chk_funcs[i->first];
                chk = new Gtk::CheckButton(i->second);
@@ -54,7 +47,7 @@ TrainPanel::TrainPanel(Remote &r, R2C2::Client &c, R2C2::NetTrain &t):
        }
 
        Glib::RefPtr<Gtk::ListStore> route_store = Gtk::ListStore::create(route_columns);
-       vbox->add(*manage(cmb_route = new Gtk::ComboBox(route_store)));
+       vbox->add(*manage(cmb_route = new Gtk::ComboBox(static_cast<const Glib::RefPtr<Gtk::TreeModel> &>(route_store))));
        cmb_route->pack_start(route_columns.name);
        route_store->append();
        const list<string> &routes = client.get_routes();