Merge pull request dolphin-emu#8692 from howard0su/warning_unused

Cleanup warnings of -Wunused-[const]-variable
Ben754 · Mar 23, 2020 · 6fab099 · 6fab099
2 parents 623a507 + 500820b
commit 6fab099
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 6 deletions.
diff --git a/Source/Core/Common/GL/GLContext.cpp b/Source/Core/Common/GL/GLContext.cpp
@@ -95,9 +95,9 @@ std::unique_ptr<GLContext> GLContext::Create(const WindowSystemInfo& wsi, bool s
 #if HAVE_X11
   if (wsi.type == WindowSystemType::X11)
   {
+#if defined(HAVE_EGL)
     // GLES 3 is not supported via GLX.
     const bool use_egl = prefer_egl || prefer_gles;
-#if defined(HAVE_EGL)
     if (use_egl)
       context = std::make_unique<GLContextEGLX11>();
     else

diff --git a/Source/Core/Core/HW/GCMemcard/GCMemcardDirectory.cpp b/Source/Core/Core/HW/GCMemcard/GCMemcardDirectory.cpp
@@ -31,7 +31,6 @@
 #include "Core/Core.h"
 #include "Core/NetPlayProto.h"
 
-const int NO_INDEX = -1;
 static const char* MC_HDR = "MC_SYSTEM_AREA";
 
 bool GCMemcardDirectory::LoadGCI(GCIFile gci)

diff --git a/Source/Core/DolphinQt/GCMemcardManager.cpp b/Source/Core/DolphinQt/GCMemcardManager.cpp
@@ -230,8 +230,6 @@ void GCMemcardManager::UpdateSlotTable(int slot)
     auto* icon = new QTableWidgetItem;
     icon->setData(Qt::DecorationRole, icon_data.m_frames[0]);
 
-    std::optional<DEntry> entry = memcard->GetDEntry(file_index);
-
     m_slot_active_icons[slot].emplace_back(std::move(icon_data));
 
     table->setItem(i, 0, banner);
@@ -531,7 +529,7 @@ GCMemcardManager::IconAnimationData GCMemcardManager::GetIconFromSaveFile(int fi
   if (decoded_data && !decoded_data->empty())
   {
     frame_data.m_frames.reserve(decoded_data->size());
-    const u32 per_frame_offset = MEMORY_CARD_ICON_WIDTH * MEMORY_CARD_ICON_HEIGHT;
+
     for (size_t f = 0; f < decoded_data->size(); ++f)
     {
       QImage img(reinterpret_cast<const u8*>((*decoded_data)[f].image_data.data()),

diff --git a/Source/Core/UICommon/AutoUpdate.cpp b/Source/Core/UICommon/AutoUpdate.cpp
@@ -43,9 +43,9 @@ const char UPDATER_RELOC_FILENAME[] = ".Dolphin Updater.2.app";
 
 #endif
 
+#ifdef OS_SUPPORTS_UPDATER
 const char UPDATER_LOG_FILE[] = "Updater.log";
 
-#ifdef OS_SUPPORTS_UPDATER
 std::string MakeUpdaterCommandLine(const std::map<std::string, std::string>& flags)
 {
 #ifdef __APPLE__