Merge pull request #4440 from lioncash/private

GCAdapterConfigDiag: Make public functions private

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& WXUNUSED(event))
 {
   bool unpause = Core::PauseAndLock(true);
   if (GCAdapter::IsDetected())

Source/Core/DolphinWX/Config/GCAdapterConfigDiag.h

@@ -14,13 +14,13 @@ public:
   GCAdapterConfigDiag(wxWindow* const parent, const wxString& name, const int tab_num = 0);
   ~GCAdapterConfigDiag();
 
-  void ScheduleAdapterUpdate();
-  void UpdateAdapter(wxCommandEvent& ev);
-
 private:
-  wxStaticText* m_adapter_status;
-  int m_pad_id;
+  void ScheduleAdapterUpdate();
 
+  void OnUpdateAdapter(wxCommandEvent& event);
   void OnAdapterRumble(wxCommandEvent& event);
   void OnAdapterKonga(wxCommandEvent& event);
+
+  wxStaticText* m_adapter_status;
+  int m_pad_id;
 };