X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Ftrainpanel.cpp;h=b29836f50736be1aa94a89ac6e29e10aa668cd50;hb=621c5c938d70ba0d155e0eda91a708db0a52c0dc;hp=51e7a88fe8e820f54b76e03a1a0f94749c170365;hpb=34f8bf04e4bdffefeceea59b186386b51c542b9d;p=r2c2.git

diff --git a/source/engineer/trainpanel.cpp b/source/engineer/trainpanel.cpp
index 51e7a88..b29836f 100644
--- a/source/engineer/trainpanel.cpp
+++ b/source/engineer/trainpanel.cpp
@@ -1,12 +1,5 @@
-/* $Id$
-
-This file is part of R²C²
-Copyright © 2006-2011  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #include <cmath>
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
 #include "libr2c2/aicontrol.h"
 #include "libr2c2/timetable.h"
 #include "libr2c2/trackiter.h"
@@ -83,9 +76,9 @@ TrainPanel::TrainPanel(Engineer &e, Train &t):
 	lbl_status->set_geometry(GLtk::Geometry(10, 60, geom.w-20, 20));
 	status.signal_changed.connect(sigc::mem_fun(this, &TrainPanel::train_status_changed));
 
-	const map<unsigned, string> &funcs = train.get_locomotive_type().get_functions();
+	const VehicleType::FunctionMap &funcs = train.get_locomotive_type().get_functions();
 	unsigned x = 10;
-	for(map<unsigned, string>::const_iterator i=funcs.begin(); i!=funcs.end(); ++i, x+=36)
+	for(VehicleType::FunctionMap::const_iterator i=funcs.begin(); i!=funcs.end(); ++i, x+=36)
 	{
 		string fname = i->second;
 		fname[0] = toupper(fname[0]);