From 700b850acdb4895a6f70942d1470e998d76819c1 Mon Sep 17 00:00:00 2001
From: comex <comexk@gmail.com>
Date: Sun, 21 Jun 2015 15:28:49 -0400
Subject: [PATCH] Fix misc. clang warnings - mostly complaints about
 inconsistent use of override.

Previously, MacOpenFile only overrode anything on OS X; otherwise it was
just a useless method, which is presumably why it wasn't marked override
in the first place.  Address this more sanely by wrapping it in #ifdef
__APPLE__.
---
 Source/Core/DolphinWX/ControllerConfigDiag.cpp              | 4 ++--
 Source/Core/DolphinWX/Main.cpp                              | 2 ++
 Source/Core/DolphinWX/Main.h                                | 4 +++-
 .../Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.h  | 6 +++---
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Source/Core/DolphinWX/ControllerConfigDiag.cpp b/Source/Core/DolphinWX/ControllerConfigDiag.cpp
index 07b803b677..ab5e220764 100644
--- a/Source/Core/DolphinWX/ControllerConfigDiag.cpp
+++ b/Source/Core/DolphinWX/ControllerConfigDiag.cpp
@@ -43,7 +43,7 @@ wxDEFINE_EVENT(wxEVT_ADAPTER_UPDATE, wxCommandEvent);
 ControllerConfigDiag::ControllerConfigDiag(wxWindow* const parent)
 	: wxDialog(parent, wxID_ANY, _("Dolphin Controller Configuration"))
 {
-	m_gc_pad_type_strs = {
+	m_gc_pad_type_strs = {{
 		_("None"),
 		_("Standard Controller"),
 		_("Steering Wheel"),
@@ -52,7 +52,7 @@ ControllerConfigDiag::ControllerConfigDiag(wxWindow* const parent)
 		_("GBA"),
 		_("Keyboard"),
 		_("AM-Baseboard")
-	};
+	}};
 
 	wxBoxSizer* const main_sizer = new wxBoxSizer(wxVERTICAL);
 
diff --git a/Source/Core/DolphinWX/Main.cpp b/Source/Core/DolphinWX/Main.cpp
index 64912416d8..b852460d66 100644
--- a/Source/Core/DolphinWX/Main.cpp
+++ b/Source/Core/DolphinWX/Main.cpp
@@ -276,12 +276,14 @@ bool DolphinApp::OnInit()
 	return true;
 }
 
+#ifdef __APPLE__
 void DolphinApp::MacOpenFile(const wxString &fileName)
 {
 	FileToLoad = fileName;
 	LoadFile = true;
 	main_frame->BootGame(WxStrToStr(FileToLoad));
 }
+#endif
 
 void DolphinApp::AfterInit()
 {
diff --git a/Source/Core/DolphinWX/Main.h b/Source/Core/DolphinWX/Main.h
index ade8f81287..a28b3e94f9 100644
--- a/Source/Core/DolphinWX/Main.h
+++ b/Source/Core/DolphinWX/Main.h
@@ -23,7 +23,9 @@ private:
 	void OnFatalException() override;
 	bool Initialize(int& c, wxChar **v) override;
 	void InitLanguageSupport();
-	void MacOpenFile(const wxString &fileName);
+#ifdef __APPLE__
+	void MacOpenFile(const wxString &fileName) override;
+#endif
 
 	bool BatchMode;
 	bool LoadFile;
diff --git a/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.h b/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.h
index 973bd1fefd..4be67a503c 100644
--- a/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.h
+++ b/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.h
@@ -57,9 +57,9 @@ public:
 
 	Keyboard(IOHIDDeviceRef device, std::string name, int index, void *window);
 
-	std::string GetName() const;
-	std::string GetSource() const;
-	int GetId() const;
+	std::string GetName() const override;
+	std::string GetSource() const override;
+	int GetId() const override;
 
 private:
 	struct