space changes, merge #defines, language fix, and code reorder/cleanup :P

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5614 8ced0084-cf51-0410-be5f-012b33b47a6e

Source/Core/InputCommon/Src/ControllerInterface/DirectInput/DirectInputJoystick.cpp

@@ -455,7 +455,7 @@ std::string Joystick::Axis::GetName() const
 {
 	std::ostringstream ss;
 	// axis
-	if ( m_index < 6 )			
+	if ( m_index < 6 )
 	{
 		ss << "Axis " << "XYZ"[m_index%3];
 		if ( m_index > 2 )