Fix remaining exception class names

[r2c2.git] / source / engineer / trainproperties.cpp

diff --git a/source/engineer/trainproperties.cpp b/source/engineer/trainproperties.cpp
index e574925f259628e7846a692a34ee9dd29069e12b..67e096a8ea84b6e1cce858e97fcc831eb24289b8 100644 (file)
--- a/source/engineer/trainproperties.cpp
+++ b/source/engineer/trainproperties.cpp
@@ -1,22 +1,15 @@
-/* $Id$
-
-This file is part of the MSP Märklin suite
-Copyright © 2006-2010  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #include <msp/gltk/label.h>
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
 #include <msp/strings/lexicalcast.h>
-#include "libmarklin/driver.h"
-#include "libmarklin/vehicle.h"
-#include "libmarklin/vehicletype.h"
+#include "libr2c2/driver.h"
+#include "libr2c2/vehicle.h"
+#include "libr2c2/vehicletype.h"
 #include "engineer.h"
 #include "trainproperties.h"
 
 using namespace std;
 using namespace Msp;
-using namespace Marklin;
+using namespace R2C2;
 
 TrainProperties::TrainProperties(Engineer &e, Train *t):
        engineer(e),
@@ -151,7 +144,7 @@ void TrainProperties::remove_vehicle_clicked()
 
        lst_vehicles->remove(selected);
 
-       unsigned n_vehicles = train->get_n_vehicles()-rem_vehicles.size();
+       unsigned n_vehicles = (train ? train->get_n_vehicles()-rem_vehicles.size() : 0);
        if(static_cast<unsigned>(selected)>=n_vehicles)
                add_vehicles.erase(add_vehicles.begin()+(selected-n_vehicles));
        else
@@ -178,5 +171,5 @@ const VehicleType &TrainProperties::get_vehicle_type(unsigned n, bool loco)
                ++i;
        }
 
-       throw InvalidParameterValue("Vehicle type index out of range");
+       throw out_of_range("TrainProperties::get_vehicle_type");
 }