piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 14:49:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2978 from lioncash/override

Browse Source 
Add missing override specifiers
This commit is contained in:
Scott Mansell
2015-09-06 19:21:59 +12:00
parent 728d082bc7 22635c1800
commit 61da83182e
7 changed files with 53 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Core/HotkeyManager.h
View File

@ -132,9 +132,9 @@ public:
HotkeyManager();
~HotkeyManager();
std::string GetName() const;
void GetInput(HotkeyStatus* const hk);
void LoadDefaults(const ControllerInterface& ciface);
std::string GetName() const override;
void LoadDefaults(const ControllerInterface& ciface) override;
private:
Buttons* m_keys[(NUM_HOTKEYS + 31) / 32];

8
Source/Core/Core/NetPlayServer.h
View File

@ -79,9 +79,11 @@ private:
unsigned int OnConnect(ENetPeer* socket);
unsigned int OnDisconnect(Client& player);
unsigned int OnData(sf::Packet& packet, Client& player);
virtual void OnTraversalStateChanged();
virtual void OnConnectReady(ENetAddress addr) {}
virtual void OnConnectFailed(u8 reason) {}
void OnTraversalStateChanged() override;
void OnConnectReady(ENetAddress) override {}
void OnConnectFailed(u8) override {}
void UpdatePadMapping();
void UpdateWiimoteMapping();
std::vector<std::pair<std::string, std::string>> GetInterfaceListInternal();