[Orxonox-commit 1366] r6084 - in code/trunk: cmake src/libraries/core/input src/orxonox

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2009-11-18 11:13:47 +0100 (Wed, 18 Nov 2009)
New Revision: 6084

Modified:
   code/trunk/cmake/SourceFileUtilities.cmake
   code/trunk/src/libraries/core/input/InputManager.h
   code/trunk/src/orxonox/Test.cc
Log:
- Fixed typing error in a cmake file causing a rebuild of the compilations every time CMake was run
- Found spelling mistakes in InputManager.h
- Found tabs in Test.cc

Modified: code/trunk/cmake/SourceFileUtilities.cmake
===================================================================
--- code/trunk/cmake/SourceFileUtilities.cmake	2009-11-18 08:41:30 UTC (rev 6083)
+++ code/trunk/cmake/SourceFileUtilities.cmake	2009-11-18 10:13:47 UTC (rev 6084)
@@ -52,7 +52,7 @@
         FOREACH(_file2 ${_compilation})
           SET(_include_string "${_include_string}#include \"${_file2}\"\n")
         ENDFOREACH(_file2)
-        IF(EXISTS )
+        IF(EXISTS ${_compilation_file})
           FILE(READ ${_compilation_file} _include_string_file)
         ENDIF()
         IF(NOT _include_string STREQUAL "${_include_string_file}")

Modified: code/trunk/src/libraries/core/input/InputManager.h
===================================================================
--- code/trunk/src/libraries/core/input/InputManager.h	2009-11-18 08:41:30 UTC (rev 6083)
+++ code/trunk/src/libraries/core/input/InputManager.h	2009-11-18 10:13:47 UTC (rev 6084)
@@ -46,7 +46,7 @@
     @brief
         Manages the input devices (mouse, keyboard, joy sticks) and the input states.
 
-        Every input device has its own wrapper class which does the actualy input event
+        Every input device has its own wrapper class which does the actually input event
         distribution. The InputManager only creates reloads (on request) those devices.
 
         The other functionality concerns handling InputStates. They act as a layer
@@ -57,7 +57,7 @@
         - The actual lists containing all the InputStates for a specific device are stored
           in the InputDevices themselves.
         - The devices_ vector always has at least two elements: Keyboard (first) and mouse.
-          You best access them intenally with InputDeviceEnumerator::Keyboard/Mouse
+          You best access them internally with InputDeviceEnumerator::Keyboard/Mouse
           The first joy stick is accessed with InputDeviceEnumerator::FirstJoyStick.
         - Keyboard construction is mandatory , mouse and joy sticks are not.
           If the OIS::InputManager or the Keyboard fail, an exception is thrown.
@@ -93,7 +93,7 @@
             Updates the devices (which distribute the input events) and the input states.
 
             Any InpuStates changes (destroy, enter, leave) and happens here. If a reload request
-            was submitted while updating, the request wil be postponed until the next update call.
+            was submitted while updating, the request will be postponed until the next update call.
         */
         void update(const Clock& time);
         //! Clears all input device buffers. This usually only includes the pressed button list.
@@ -134,7 +134,7 @@
         /**
         @brief
             Activates a specific input state.
-            It might not be actually activated if the priority is too low!
+            It might not actually be activated if the priority is too low!
         @return
             False if name was not found, true otherwise.
         */
@@ -171,7 +171,7 @@
         // don't mess with a Singleton
         InputManager(const InputManager&);
 
-        // Intenal methods
+        // Internal methods
         void loadDevices();
         void loadMouse();
         void loadJoySticks();

Modified: code/trunk/src/orxonox/Test.cc
===================================================================
--- code/trunk/src/orxonox/Test.cc	2009-11-18 08:41:30 UTC (rev 6083)
+++ code/trunk/src/orxonox/Test.cc	2009-11-18 10:13:47 UTC (rev 6084)
@@ -35,7 +35,7 @@
 
 namespace orxonox
 {
-	CreateFactory ( Test );
+    CreateFactory ( Test );
   
   SetConsoleCommand(Test, printV1, true).accessLevel(AccessLevel::User);
   SetConsoleCommand(Test, printV2, true).accessLevel(AccessLevel::User);
@@ -55,24 +55,24 @@
   
   Test* Test::instance_ = 0;
 
-	Test::Test(BaseObject* creator) : BaseObject(creator), Synchronisable(creator)
-	{
+    Test::Test(BaseObject* creator) : BaseObject(creator), Synchronisable(creator)
+    {
     assert(instance_==0);
     instance_=this;
-		RegisterObject ( Test );
+        RegisterObject ( Test );
     setConfigValues();
     registerVariables();
-		setSyncMode(0x3);
-	}
+        setSyncMode(0x3);
+    }
 
-	Test::~Test()
-	{
+    Test::~Test()
+    {
     instance_=0;
-	}
+    }
 
-	void Test::setConfigValues()
-	{
-		SetConfigValue ( u1, 1 )/*.callback ( this, &Test::checkV1 )*/;
+    void Test::setConfigValues()
+    {
+        SetConfigValue ( u1, 1 )/*.callback ( this, &Test::checkV1 )*/;
     SetConfigValue ( u2, 2 )/*.callback ( this, &Test::checkV2 )*/;
     SetConfigValue ( u3, 3 )/*.callback ( this, &Test::checkV3 )*/;
     SetConfigValue ( u4, 4 )/*.callback ( this, &Test::checkV4 )*/;
@@ -81,7 +81,7 @@
     SetConfigValue ( s2, 2 )/*.callback ( this, &Test::checkV2 )*/;
     SetConfigValue ( s3, 3 )/*.callback ( this, &Test::checkV3 )*/;
     SetConfigValue ( s4, 4 )/*.callback ( this, &Test::checkV4 )*/;
-	}
+    }
 
 
   void Test::registerVariables()