Merge branch 'master' of https://github.com/wgois/OIS

Conflicts:
	demos/OISConsole.cpp

Had pushed this fix to the wrong repo previously - KR

includes/mac/MacKeyboard.h

@@ -54,6 +54,7 @@ namespace OIS
 
         // Returns a description of the given key
         virtual std::string& getAsString( KeyCode key );
+        virtual KeyCode getAsKeyCode( std::string str ) {/*TODO: Implement OS version*/;}
 
         virtual Interface* queryInterface( Interface::IType type ) { return 0; }
 

includes/win32/Win32KeyBoard.h

@@ -50,6 +50,9 @@ namespace OIS
 		/** @copydoc Keyboard::getAsString */
 		virtual const std::string& getAsString(KeyCode kc);
 
+		/** @copydoc Keyboard::getAsKeyCode */        
+		virtual KeyCode getAsKeyCode( std::string str ) {/*TODO: Implement OS version*/;}
+
 		/** @copydoc Keyboard::copyKeyStates */
 		virtual void copyKeyStates(char keys[256]) const;
 
@@ -60,7 +63,7 @@ namespace OIS
 		virtual void capture();
 
 		/** @copydoc Object::queryInterface */
-		virtual Interface* queryInterface(Interface::IType type) {return 0;}
+		virtual Interface* queryInterface(Interface::IType type) { OIS_UNUSED(type); return 0; }
 
 		/** @copydoc Object::_initialize */
 		virtual void _initialize();

includes/win32/Win32Mouse.h

@@ -41,7 +41,7 @@ namespace OIS
 		virtual void capture();
 
 		/** @copydoc Object::queryInterface */
-		virtual Interface* queryInterface(Interface::IType type) {return 0;}
+		virtual Interface* queryInterface(Interface::IType type) { OIS_UNUSED(type); return 0;}
 
 		/** @copydoc Object::_initialize */
 		virtual void _initialize();

src/OISEffect.cpp

@@ -64,15 +64,6 @@ const char* Effect::getDirectionName(Effect::EDirection eValue)
   return (eValue >= 0 && eValue < _DirectionsNumber) ? pszEDirectionString[eValue] : "<Bad direction>";
 }
 
-//------------------------------------------------------------------------------//
-Effect::Effect() : 
-	force(UnknownForce), 
-	type(Unknown),
-	effect(0),
-	axes(1)
-{
-}
-
 //------------------------------------------------------------------------------//
 Effect::Effect(EForce ef, EType et) :
 	force(ef),

src/OISInputManager.cpp

@@ -266,6 +266,8 @@ void InputManager::removeFactoryCreator( FactoryCreator* factory )
 //----------------------------------------------------------------------------//
 void InputManager::enableAddOnFactory(AddOnFactories factory)
 {
+	OIS_UNUSED(factory);
+
 #if defined OIS_LIRC_SUPPORT
 	if( factory == AddOn_LIRC || factory == AddOn_All )
 	{