Exception changes

[libs/gui.git] / source / input / hub.cpp

diff --git a/source/input/hub.cpp b/source/input/hub.cpp
index 6a78882c06273f209830253202acc79c8aa96f84..cbf9f78a689e083d79057945ba84eb218aba3685 100644 (file)
--- a/source/input/hub.cpp
+++ b/source/input/hub.cpp
@@ -1,7 +1,9 @@
+#include <stdexcept>
 #include <sigc++/bind.h>
-#include <msp/core/except.h>
 #include "hub.h"
 
+using namespace std;
+
 namespace Msp {
 namespace Input {
 
@@ -24,7 +26,7 @@ std::string Hub::get_button_name(unsigned btn) const
 {
        unsigned dev_index = btn>>12;
        if(dev_index>=devices.size())
-               throw InvalidParameterValue("Button does not exist");
+               throw invalid_argument("Hub::get_button_name");
 
        const Device &dev = *devices[dev_index];
        return dev.get_name()+": "+dev.get_button_name(btn&0xFFF);
@@ -34,7 +36,7 @@ std::string Hub::get_axis_name(unsigned axis) const
 {
        unsigned dev_index = axis>>12;
        if(dev_index>=devices.size())
-               throw InvalidParameterValue("Axis does not exist");
+               throw invalid_argument("Hub::get_axis_name");
 
        const Device &dev = *devices[dev_index];
        return dev.get_name()+": "+dev.get_axis_name(axis&0xFFF);