diff options
| author | 2018-08-02 21:41:51 -0400 | |
|---|---|---|
| committer | 2018-08-02 21:44:25 -0400 | |
| commit | 29b6afb82f39a9f21389e2d9ee65ff6cdd909db8 (patch) | |
| tree | 7ead7d2f209cac64066d5c91aed3721dd595b9e2 | |
| parent | Merge pull request #896 from lioncash/audio-out (diff) | |
| download | yuzu-29b6afb82f39a9f21389e2d9ee65ff6cdd909db8.tar.gz yuzu-29b6afb82f39a9f21389e2d9ee65ff6cdd909db8.tar.xz yuzu-29b6afb82f39a9f21389e2d9ee65ff6cdd909db8.zip | |
input_common: Add missing override specifiers
Diffstat (limited to '')
| -rw-r--r-- | src/input_common/keyboard.cpp | 2 | ||||
| -rw-r--r-- | src/input_common/motion_emu.cpp | 2 | ||||
| -rw-r--r-- | src/input_common/sdl/sdl.cpp | 12 |
3 files changed, 2 insertions, 14 deletions
diff --git a/src/input_common/keyboard.cpp b/src/input_common/keyboard.cpp index 0f0d10f23..0410ff328 100644 --- a/src/input_common/keyboard.cpp +++ b/src/input_common/keyboard.cpp | |||
| @@ -14,7 +14,7 @@ public: | |||
| 14 | explicit KeyButton(std::shared_ptr<KeyButtonList> key_button_list_) | 14 | explicit KeyButton(std::shared_ptr<KeyButtonList> key_button_list_) |
| 15 | : key_button_list(key_button_list_) {} | 15 | : key_button_list(key_button_list_) {} |
| 16 | 16 | ||
| 17 | ~KeyButton(); | 17 | ~KeyButton() override; |
| 18 | 18 | ||
| 19 | bool GetStatus() const override { | 19 | bool GetStatus() const override { |
| 20 | return status.load(); | 20 | return status.load(); |
diff --git a/src/input_common/motion_emu.cpp b/src/input_common/motion_emu.cpp index caffe48cb..9570c060e 100644 --- a/src/input_common/motion_emu.cpp +++ b/src/input_common/motion_emu.cpp | |||
| @@ -131,7 +131,7 @@ public: | |||
| 131 | device = std::make_shared<MotionEmuDevice>(update_millisecond, sensitivity); | 131 | device = std::make_shared<MotionEmuDevice>(update_millisecond, sensitivity); |
| 132 | } | 132 | } |
| 133 | 133 | ||
| 134 | std::tuple<Math::Vec3<float>, Math::Vec3<float>> GetStatus() const { | 134 | std::tuple<Math::Vec3<float>, Math::Vec3<float>> GetStatus() const override { |
| 135 | return device->GetStatus(); | 135 | return device->GetStatus(); |
| 136 | } | 136 | } |
| 137 | 137 | ||
diff --git a/src/input_common/sdl/sdl.cpp b/src/input_common/sdl/sdl.cpp index 8d117c2d4..604d9a7d9 100644 --- a/src/input_common/sdl/sdl.cpp +++ b/src/input_common/sdl/sdl.cpp | |||
| @@ -314,10 +314,6 @@ namespace Polling { | |||
| 314 | 314 | ||
| 315 | class SDLPoller : public InputCommon::Polling::DevicePoller { | 315 | class SDLPoller : public InputCommon::Polling::DevicePoller { |
| 316 | public: | 316 | public: |
| 317 | SDLPoller() = default; | ||
| 318 | |||
| 319 | ~SDLPoller() = default; | ||
| 320 | |||
| 321 | void Start() override { | 317 | void Start() override { |
| 322 | // SDL joysticks must be opened, otherwise they don't generate events | 318 | // SDL joysticks must be opened, otherwise they don't generate events |
| 323 | SDL_JoystickUpdate(); | 319 | SDL_JoystickUpdate(); |
| @@ -341,10 +337,6 @@ private: | |||
| 341 | 337 | ||
| 342 | class SDLButtonPoller final : public SDLPoller { | 338 | class SDLButtonPoller final : public SDLPoller { |
| 343 | public: | 339 | public: |
| 344 | SDLButtonPoller() = default; | ||
| 345 | |||
| 346 | ~SDLButtonPoller() = default; | ||
| 347 | |||
| 348 | Common::ParamPackage GetNextInput() override { | 340 | Common::ParamPackage GetNextInput() override { |
| 349 | SDL_Event event; | 341 | SDL_Event event; |
| 350 | while (SDL_PollEvent(&event)) { | 342 | while (SDL_PollEvent(&event)) { |
| @@ -364,10 +356,6 @@ public: | |||
| 364 | 356 | ||
| 365 | class SDLAnalogPoller final : public SDLPoller { | 357 | class SDLAnalogPoller final : public SDLPoller { |
| 366 | public: | 358 | public: |
| 367 | SDLAnalogPoller() = default; | ||
| 368 | |||
| 369 | ~SDLAnalogPoller() = default; | ||
| 370 | |||
| 371 | void Start() override { | 359 | void Start() override { |
| 372 | SDLPoller::Start(); | 360 | SDLPoller::Start(); |
| 373 | 361 | ||