From 566a7a4829ea66cf86ad104164ea66b73987c1a5 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 20 Jan 2015 21:03:55 -0500 Subject: [PATCH] SI_DeviceKeyboard: Remove superfluous virtual specifiers. Removes an unnecessary memset as well. --- Source/Core/Core/HW/SI_DeviceKeyboard.cpp | 3 +-- Source/Core/Core/HW/SI_DeviceKeyboard.h | 12 ++++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Source/Core/Core/HW/SI_DeviceKeyboard.cpp b/Source/Core/Core/HW/SI_DeviceKeyboard.cpp index bd1ba902ba..a6abb31508 100644 --- a/Source/Core/Core/HW/SI_DeviceKeyboard.cpp +++ b/Source/Core/Core/HW/SI_DeviceKeyboard.cpp @@ -51,8 +51,7 @@ int CSIDevice_Keyboard::RunBuffer(u8* _pBuffer, int _iLength) KeyboardStatus CSIDevice_Keyboard::GetKeyboardStatus() { - KeyboardStatus KeyStatus; - memset(&KeyStatus, 0, sizeof(KeyStatus)); + KeyboardStatus KeyStatus = {}; Keyboard::GetStatus(ISIDevice::m_iDeviceNumber, &KeyStatus); return KeyStatus; } diff --git a/Source/Core/Core/HW/SI_DeviceKeyboard.h b/Source/Core/Core/HW/SI_DeviceKeyboard.h index 923a5a8603..8155b80ec0 100644 --- a/Source/Core/Core/HW/SI_DeviceKeyboard.h +++ b/Source/Core/Core/HW/SI_DeviceKeyboard.h @@ -50,17 +50,17 @@ public: CSIDevice_Keyboard(SIDevices device, int _iDeviceNumber); // Run the SI Buffer - virtual int RunBuffer(u8* _pBuffer, int _iLength) override; + int RunBuffer(u8* _pBuffer, int _iLength) override; // Return true on new data - virtual bool GetData(u32& _Hi, u32& _Low) override; + bool GetData(u32& _Hi, u32& _Low) override; - virtual KeyboardStatus GetKeyboardStatus(); - virtual void MapKeys(KeyboardStatus& KeyStatus, u8* key); + KeyboardStatus GetKeyboardStatus(); + void MapKeys(KeyboardStatus& KeyStatus, u8* key); // Send a command directly - virtual void SendCommand(u32 _Cmd, u8 _Poll) override; + void SendCommand(u32 _Cmd, u8 _Poll) override; // Savestate support - virtual void DoState(PointerWrap& p) override; + void DoState(PointerWrap& p) override; };