Discard the EventSource abstraction

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

diff --git a/source/input/keys.cpp b/source/input/keys.cpp
index 37a376aaa6c662eb391aaa4704148f5adcb8e8dd..508c06fb9d24b4a38bdd216b1231924d9a0f4e7b 100644 (file)
--- a/source/input/keys.cpp
+++ b/source/input/keys.cpp
@@ -1,11 +1,11 @@
 #include <map>
+#include <stdexcept>
 #ifdef WIN32
 #include <windows.h>
 #else
 #include <X11/X.h>
 #include <X11/keysym.h>
 #endif
-#include <msp/core/except.h>
 #include "keys.h"
 
 using namespace std;
@@ -113,19 +113,19 @@ namespace Input {
 
 unsigned key_from_sys(unsigned code)
 {
-       static bool init_done=false;
+       static bool init_done = false;
        static map<unsigned, unsigned> reverse_map;
 
        if(!init_done)
        {
                for(unsigned i=0; i<N_KEYS_; ++i)
                        if(keymap[i])
-                               reverse_map[keymap[i]]=i;
+                               reverse_map[keymap[i]] = i;
 
-               init_done=true;
+               init_done = true;
        }
 
-       map<unsigned, unsigned>::const_iterator i=reverse_map.find(code);
+       map<unsigned, unsigned>::const_iterator i = reverse_map.find(code);
        if(i!=reverse_map.end())
                return i->second;
 
@@ -135,7 +135,7 @@ unsigned key_from_sys(unsigned code)
 unsigned key_to_sys(unsigned key)
 {
        if(key>=N_KEYS_)
-               throw InvalidParameterValue("Key out of range");
+               throw invalid_argument("key_to_sys");
        return keymap[key];
 }
 
@@ -144,7 +144,7 @@ unsigned mod_from_sys(unsigned mod)
        unsigned result = 0;
        for(unsigned i=0; i<N_MODS_; ++i)
                if(mod&modmap[i])
-                       result|=1<<i;
+                       result |= 1<<i;
        return result;
 }