From 4b1614637072bc8357fc66969fae9391507545d0 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 13 Jan 2007 06:44:16 +0000 Subject: [PATCH] remove typedef --- stepmania/src/InputMapper.cpp | 4 ++-- stepmania/src/InputMapper.h | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/stepmania/src/InputMapper.cpp b/stepmania/src/InputMapper.cpp index bd0c8b32cb..5e0a2b5508 100644 --- a/stepmania/src/InputMapper.cpp +++ b/stepmania/src/InputMapper.cpp @@ -52,7 +52,7 @@ struct AutoJoyMapping const char *szGame; const char *szDriverRegex; // reported by InputHandler const char *szControllerName; // the product name of the controller - InputMapper::Mapping maps[32]; + InputMapping maps[32]; }; #define END_MARKER {-1, DeviceButton_Invalid, GameButton_Invalid, false }, // end marker const InputMapping g_DefaultKeyMappings[] = @@ -498,7 +498,7 @@ void InputMapper::Unmap( InputDevice id ) UpdateTempDItoGI(); } -void InputMapper::ApplyMapping( const Mapping *maps, GameController gc, InputDevice id ) +void InputMapper::ApplyMapping( const InputMapping *maps, GameController gc, InputDevice id ) { map MappedButtons; diff --git a/stepmania/src/InputMapper.h b/stepmania/src/InputMapper.h index 8d1856cfe8..e7109adf02 100644 --- a/stepmania/src/InputMapper.h +++ b/stepmania/src/InputMapper.h @@ -98,13 +98,11 @@ public: void RepeatStopKey( const GameInput &GameI ); void RepeatStopKey( GameButton MenuI, PlayerNumber pn ); - typedef InputMapping Mapping; - static InputDevice MultiPlayerToInputDevice( MultiPlayer mp ); static MultiPlayer InputDeviceToMultiPlayer( InputDevice id ); void Unmap( InputDevice device ); - void ApplyMapping( const Mapping *maps, GameController gc, InputDevice device ); + void ApplyMapping( const InputMapping *maps, GameController gc, InputDevice device ); protected: // all the DeviceInputs that map to a GameInput