diff options
| author | JosJuice <josjuice@gmail.com> | 2020-03-23 19:10:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-23 19:10:52 +0100 |
| commit | 6fab09951bdd68cd24769a3347cd460d656baf95 (patch) | |
| tree | a812484d90202941d5b9602722569864475bb8eb /Source/Core | |
| parent | 623a50786d01a6d7fed2c0290fed660a28fa02b4 (diff) | |
| parent | 500820b3520bc13ab639911293b7e2bd9b8d6518 (diff) | |
Merge pull request #8692 from howard0su/warning_unused
Cleanup warnings of -Wunused-[const]-variable
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Common/GL/GLContext.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/Core/HW/GCMemcard/GCMemcardDirectory.cpp | 1 | ||||
| -rw-r--r-- | Source/Core/DolphinQt/GCMemcardManager.cpp | 4 | ||||
| -rw-r--r-- | Source/Core/UICommon/AutoUpdate.cpp | 2 |
4 files changed, 3 insertions, 6 deletions
diff --git a/Source/Core/Common/GL/GLContext.cpp b/Source/Core/Common/GL/GLContext.cpp index 5d740f9211..d6969bcb55 100644 --- 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 index 4153c7197a..2a737244a6 100644 --- 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 index 395eb553c6..52c2dcfa35 100644 --- 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 index 0cca98b4b2..b7c26fb707 100644 --- 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__ |