From 04c1757b49abe0fc3a928c4e7a8e98f54fd47cd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Lam?= <leo@innovatetechnologi.es>
Date: Mon, 3 Oct 2016 19:29:19 +0200
Subject: [PATCH] Fix a few warnings

---
 Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp  | 2 +-
 Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp | 4 ++--
 Source/Core/DolphinWX/Debugger/RegisterView.cpp      | 6 +++---
 Source/Core/DolphinWX/FifoPlayerDlg.h                | 2 --
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp b/Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp
index 9b663a3687..c245a358cb 100644
--- a/Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp
+++ b/Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp
@@ -138,7 +138,7 @@ void AdvancedConfigPane::OnClockOverrideSliderChanged(wxCommandEvent& event)
   UpdateCPUClock();
 }
 
-u32 ToSeconds(wxDateTime date)
+static u32 ToSeconds(wxDateTime date)
 {
   return static_cast<u32>(date.GetValue().GetValue() / 1000);
 }
diff --git a/Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp b/Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp
index ae1a79ba04..988230612f 100644
--- a/Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp
+++ b/Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp
@@ -30,7 +30,7 @@
 #include "DolphinWX/X11Utils.h"
 #endif
 
-static const std::array<std::string, 29> language_ids = {
+static const std::array<std::string, 29> language_ids = {{
     "",
 
     "ms", "ca", "cs",    "da", "de", "en", "es",    "fr",    "hr", "it", "hu", "nl",
@@ -38,7 +38,7 @@ static const std::array<std::string, 29> language_ids = {
     "pl", "pt", "pt_BR", "ro", "sr", "sv", "tr",
 
     "el", "ru", "ar",    "fa", "ko", "ja", "zh_CN", "zh_TW",
-};
+}};
 
 InterfaceConfigPane::InterfaceConfigPane(wxWindow* parent, wxWindowID id) : wxPanel(parent, id)
 {
diff --git a/Source/Core/DolphinWX/Debugger/RegisterView.cpp b/Source/Core/DolphinWX/Debugger/RegisterView.cpp
index f7145fd577..96518b3ea3 100644
--- a/Source/Core/DolphinWX/Debugger/RegisterView.cpp
+++ b/Source/Core/DolphinWX/Debugger/RegisterView.cpp
@@ -345,7 +345,7 @@ wxString CRegTable::GetValue(int row, int col)
   }
   else
   {
-    if (row - 32 < NUM_SPECIALS)
+    if (static_cast<size_t>(row - 32) < NUM_SPECIALS)
     {
       switch (col)
       {
@@ -386,7 +386,7 @@ void CRegTable::SetValue(int row, int col, const wxString& strNewVal)
   }
   else
   {
-    if ((row - 32 < NUM_SPECIALS) && (col == 1))
+    if ((static_cast<size_t>(row - 32) < NUM_SPECIALS) && col == 1)
     {
       u32 new_val = 0;
       if (TryParse("0x" + WxStrToStr(strNewVal), &new_val))
@@ -407,7 +407,7 @@ void CRegTable::UpdateCachedRegs()
     m_CachedFRegHasChanged[i][1] = (m_CachedFRegs[i][1] != riPS1(i));
     m_CachedFRegs[i][1] = riPS1(i);
   }
-  for (int i = 0; i < NUM_SPECIALS; ++i)
+  for (size_t i = 0; i < NUM_SPECIALS; ++i)
   {
     m_CachedSpecialRegHasChanged[i] = (m_CachedSpecialRegs[i] != GetSpecialRegValue(i));
     m_CachedSpecialRegs[i] = GetSpecialRegValue(i);
diff --git a/Source/Core/DolphinWX/FifoPlayerDlg.h b/Source/Core/DolphinWX/FifoPlayerDlg.h
index d4974cb1f4..16f562e3c7 100644
--- a/Source/Core/DolphinWX/FifoPlayerDlg.h
+++ b/Source/Core/DolphinWX/FifoPlayerDlg.h
@@ -121,7 +121,5 @@ private:
   std::vector<SearchResult> search_results;
   unsigned int m_search_result_idx;
 
-  wxButton* m_Close;
-
   s32 m_FramesToRecord;
 };