[Orxonox-commit 745] r3275 - branches/core4/src/core/input

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2009-07-12 16:44:27 +0200 (Sun, 12 Jul 2009)
New Revision: 3275

Modified:
   branches/core4/src/core/input/Keyboard.cc
   branches/core4/src/core/input/Keyboard.h
   branches/core4/src/core/input/Mouse.h
Log:
Build fixes for actual compilers ^^

Modified: branches/core4/src/core/input/Keyboard.cc
===================================================================
--- branches/core4/src/core/input/Keyboard.cc	2009-07-12 14:12:04 UTC (rev 3274)
+++ branches/core4/src/core/input/Keyboard.cc	2009-07-12 14:44:27 UTC (rev 3275)
@@ -42,7 +42,8 @@
         if(arg.key == OIS::KC_RSHIFT   || arg.key == OIS::KC_LSHIFT)
             modifiers_ |= KeyboardModifier::Shift; // shift key
 
-        super::buttonPressed(KeyEvent(arg));
+        KeyEvent evt(arg);
+        super::buttonPressed(evt);
         return true;
     }
 
@@ -57,7 +58,8 @@
         if(arg.key == OIS::KC_RSHIFT   || arg.key == OIS::KC_LSHIFT)
             modifiers_ &= ~KeyboardModifier::Shift; // shift key
 
-        super::buttonReleased(KeyEvent(arg));
+        KeyEvent evt(arg);
+        super::buttonReleased(evt);
         return true;
     }
 }

Modified: branches/core4/src/core/input/Keyboard.h
===================================================================
--- branches/core4/src/core/input/Keyboard.h	2009-07-12 14:12:04 UTC (rev 3274)
+++ branches/core4/src/core/input/Keyboard.h	2009-07-12 14:44:27 UTC (rev 3275)
@@ -45,7 +45,7 @@
         : public InputDeviceTemplated<KeyboardTraits>
         , public OIS::KeyListener
     {
-        friend InputDeviceTemplated<KeyboardTraits>;
+        friend class InputDeviceTemplated<KeyboardTraits>;
         //! Super class alias
         typedef InputDeviceTemplated<KeyboardTraits> super;
 

Modified: branches/core4/src/core/input/Mouse.h
===================================================================
--- branches/core4/src/core/input/Mouse.h	2009-07-12 14:12:04 UTC (rev 3274)
+++ branches/core4/src/core/input/Mouse.h	2009-07-12 14:44:27 UTC (rev 3275)
@@ -43,7 +43,7 @@
         : public InputDeviceTemplated<MouseTraits>
         , public OIS::MouseListener
     {
-        friend InputDeviceTemplated<MouseTraits>;
+        friend class InputDeviceTemplated<MouseTraits>;
         //! Super class alias
         typedef InputDeviceTemplated<MouseTraits> super;