diff options
| author | Jasper St. Pierre <jstpierre@mecheye.net> | 2014-11-13 00:55:14 -0800 |
|---|---|---|
| committer | Jasper St. Pierre <jstpierre@mecheye.net> | 2014-11-28 10:50:45 -0800 |
| commit | f2787f620eebbbfb746f59cfbd0318210297061b (patch) | |
| tree | f40c85046226e9ae38114132df65c8e8c16d2425 /Source/Core/InputCommon/ControllerInterface/SDL | |
| parent | 61fcfc4bf2058d971af6882af2765ad34d935fcb (diff) | |
ControllerInterface: Make UpdateInput / UpdateOutput return void
The return values here have never been checked, so it doesn't make sense
to return a value to begin with.
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/SDL')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp | 7 | ||||
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/SDL/SDL.h | 4 |
2 files changed, 4 insertions, 7 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp b/Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp index b745f7b2d4..5428778163 100644 --- a/Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp +++ b/Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp @@ -316,15 +316,13 @@ void Joystick::TriangleEffect::SetState(ControlState state) } #endif -bool Joystick::UpdateInput() +void Joystick::UpdateInput() { // each joystick is doin this, o well SDL_JoystickUpdate(); - - return true; } -bool Joystick::UpdateOutput() +void Joystick::UpdateOutput() { #ifdef USE_SDL_HAPTIC for (auto &i : m_state_out) @@ -359,7 +357,6 @@ bool Joystick::UpdateOutput() } } #endif - return true; } std::string Joystick::GetName() const diff --git a/Source/Core/InputCommon/ControllerInterface/SDL/SDL.h b/Source/Core/InputCommon/ControllerInterface/SDL/SDL.h index 76fc028ec9..d1aeb38f4a 100644 --- a/Source/Core/InputCommon/ControllerInterface/SDL/SDL.h +++ b/Source/Core/InputCommon/ControllerInterface/SDL/SDL.h @@ -134,8 +134,8 @@ private: #endif public: - bool UpdateInput() override; - bool UpdateOutput() override; + void UpdateInput() override; + void UpdateOutput() override; Joystick(SDL_Joystick* const joystick, const int sdl_index, const unsigned int index); ~Joystick(); |
