From c5c7ff9fd61366c3ec0fceab221225294414c2bf Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Thu, 10 Nov 2016 20:11:59 -0500
Subject: [PATCH 1/3] GCAdapterConfigDiag: Make functions private where
 applicable

These don't need to be in the public interface.
---
 Source/Core/DolphinWX/Config/GCAdapterConfigDiag.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Source/Core/DolphinWX/Config/GCAdapterConfigDiag.h b/Source/Core/DolphinWX/Config/GCAdapterConfigDiag.h
index a8ce4f0d2a..fe562599f1 100644
--- a/Source/Core/DolphinWX/Config/GCAdapterConfigDiag.h
+++ b/Source/Core/DolphinWX/Config/GCAdapterConfigDiag.h
@@ -14,13 +14,13 @@ public:
   GCAdapterConfigDiag(wxWindow* const parent, const wxString& name, const int tab_num = 0);
   ~GCAdapterConfigDiag();
 
+private:
   void ScheduleAdapterUpdate();
   void UpdateAdapter(wxCommandEvent& ev);
 
-private:
-  wxStaticText* m_adapter_status;
-  int m_pad_id;
-
   void OnAdapterRumble(wxCommandEvent& event);
   void OnAdapterKonga(wxCommandEvent& event);
+
+  wxStaticText* m_adapter_status;
+  int m_pad_id;
 };

From 1ae9027a6b858b2a1050eb47d370838c64ec354b Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Thu, 10 Nov 2016 20:18:12 -0500
Subject: [PATCH 2/3] GCAdapterConfigDiag: Rename UpdateAdapter to
 OnUpdateAdapter

Uses the general naming convention for event functions.
---
 Source/Core/DolphinWX/Config/GCAdapterConfigDiag.cpp | 4 ++--
 Source/Core/DolphinWX/Config/GCAdapterConfigDiag.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Source/Core/DolphinWX/Config/GCAdapterConfigDiag.cpp b/Source/Core/DolphinWX/Config/GCAdapterConfigDiag.cpp
index 66ab071a4c..cbafae1364 100644
--- a/Source/Core/DolphinWX/Config/GCAdapterConfigDiag.cpp
+++ b/Source/Core/DolphinWX/Config/GCAdapterConfigDiag.cpp
@@ -56,7 +56,7 @@ GCAdapterConfigDiag::GCAdapterConfigDiag(wxWindow* const parent, const wxString&
   SetSizerAndFit(szr);
   Center();
 
-  Bind(wxEVT_ADAPTER_UPDATE, &GCAdapterConfigDiag::UpdateAdapter, this);
+  Bind(wxEVT_ADAPTER_UPDATE, &GCAdapterConfigDiag::OnUpdateAdapter, this);
 }
 
 GCAdapterConfigDiag::~GCAdapterConfigDiag()
@@ -69,7 +69,7 @@ void GCAdapterConfigDiag::ScheduleAdapterUpdate()
   wxQueueEvent(this, new wxCommandEvent(wxEVT_ADAPTER_UPDATE));
 }
 
-void GCAdapterConfigDiag::UpdateAdapter(wxCommandEvent& ev)
+void GCAdapterConfigDiag::OnUpdateAdapter(wxCommandEvent& ev)
 {
   bool unpause = Core::PauseAndLock(true);
   if (GCAdapter::IsDetected())
diff --git a/Source/Core/DolphinWX/Config/GCAdapterConfigDiag.h b/Source/Core/DolphinWX/Config/GCAdapterConfigDiag.h
index fe562599f1..f572cfb339 100644
--- a/Source/Core/DolphinWX/Config/GCAdapterConfigDiag.h
+++ b/Source/Core/DolphinWX/Config/GCAdapterConfigDiag.h
@@ -16,8 +16,8 @@ public:
 
 private:
   void ScheduleAdapterUpdate();
-  void UpdateAdapter(wxCommandEvent& ev);
 
+  void OnUpdateAdapter(wxCommandEvent& ev);
   void OnAdapterRumble(wxCommandEvent& event);
   void OnAdapterKonga(wxCommandEvent& event);
 

From 2d9ef3412a719e007c200cfd04952e32e57b4eb1 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Thu, 10 Nov 2016 20:19:53 -0500
Subject: [PATCH 3/3] GCAdapterConfigDiag: Mark OnUpdateAdapter parameter as
 unused.

---
 Source/Core/DolphinWX/Config/GCAdapterConfigDiag.cpp | 2 +-
 Source/Core/DolphinWX/Config/GCAdapterConfigDiag.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/Core/DolphinWX/Config/GCAdapterConfigDiag.cpp b/Source/Core/DolphinWX/Config/GCAdapterConfigDiag.cpp
index cbafae1364..9cf3110e09 100644
--- a/Source/Core/DolphinWX/Config/GCAdapterConfigDiag.cpp
+++ b/Source/Core/DolphinWX/Config/GCAdapterConfigDiag.cpp
@@ -69,7 +69,7 @@ void GCAdapterConfigDiag::ScheduleAdapterUpdate()
   wxQueueEvent(this, new wxCommandEvent(wxEVT_ADAPTER_UPDATE));
 }
 
-void GCAdapterConfigDiag::OnUpdateAdapter(wxCommandEvent& ev)
+void GCAdapterConfigDiag::OnUpdateAdapter(wxCommandEvent& WXUNUSED(event))
 {
   bool unpause = Core::PauseAndLock(true);
   if (GCAdapter::IsDetected())
diff --git a/Source/Core/DolphinWX/Config/GCAdapterConfigDiag.h b/Source/Core/DolphinWX/Config/GCAdapterConfigDiag.h
index f572cfb339..a52b0e4634 100644
--- a/Source/Core/DolphinWX/Config/GCAdapterConfigDiag.h
+++ b/Source/Core/DolphinWX/Config/GCAdapterConfigDiag.h
@@ -17,7 +17,7 @@ public:
 private:
   void ScheduleAdapterUpdate();
 
-  void OnUpdateAdapter(wxCommandEvent& ev);
+  void OnUpdateAdapter(wxCommandEvent& event);
   void OnAdapterRumble(wxCommandEvent& event);
   void OnAdapterKonga(wxCommandEvent& event);