rm prefixes for all elements in the otk namepsace

[chaz/openbox] / otk / eventhandler.cc

diff --git a/otk/eventhandler.cc b/otk/eventhandler.cc
index 7e1ad745c2ad37ef1726ee6716164496f0b78dca..e4a24df81782e87d38d54bb220d9897f62de61f6 100644 (file)
--- a/otk/eventhandler.cc
+++ b/otk/eventhandler.cc
@@ -9,17 +9,17 @@
 
 namespace otk {
 
-OtkEventHandler::OtkEventHandler()
+EventHandler::EventHandler()
 {
 }
 
 
-OtkEventHandler::~OtkEventHandler()
+EventHandler::~EventHandler()
 {
 }
 
 
-void OtkEventHandler::handle(const XEvent &e)
+void EventHandler::handle(const XEvent &e)
 {
   switch(e.type){
   case KeyPress:
@@ -88,11 +88,11 @@ void OtkEventHandler::handle(const XEvent &e)
     return selectionRequestHandler(e.xselectionrequest);
   default:
 #ifdef    SHAPE
-    if (e.type == otk::OBDisplay::shapeEventBase())
+    if (e.type == Display::shapeEventBase())
       return shapeHandler((*(XShapeEvent*)&e));
 #endif // SHAPE
 #ifdef    XKB
-    if (e.type == otk::OBDisplay::xkbEventBase())
+    if (e.type == Display::xkbEventBase())
       return xkbHandler((*(XkbEvent*)&e));
 #endif // XKB
     ;
@@ -100,7 +100,7 @@ void OtkEventHandler::handle(const XEvent &e)
 }
 
 
-void OtkEventHandler::clientMessageHandler(const XClientMessageEvent &)
+void EventHandler::clientMessageHandler(const XClientMessageEvent &)
 {
   
 }