mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-03-02 13:13:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #8692 from howard0su/warning_unused

Browse Source 
Cleanup warnings of -Wunused-[const]-variable
This commit is contained in:
JosJuice 2020-03-23 19:10:52 +01:00 committed by GitHub
commit 6fab09951b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Common/GL/GLContext.cpp
View File

@ -95,9 +95,9 @@ std::unique_ptr<GLContext> GLContext::Create(const WindowSystemInfo& wsi, bool s
#if HAVE_X11 #if HAVE_X11
if (wsi.type == WindowSystemType::X11) if (wsi.type == WindowSystemType::X11)
{ {
#if defined(HAVE_EGL)
// GLES 3 is not supported via GLX. // GLES 3 is not supported via GLX.
const bool use_egl = prefer_egl || prefer_gles; const bool use_egl = prefer_egl || prefer_gles;
#if defined(HAVE_EGL)
if (use_egl) if (use_egl)
context = std::make_unique<GLContextEGLX11>(); context = std::make_unique<GLContextEGLX11>();
else else

1
Source/Core/Core/HW/GCMemcard/GCMemcardDirectory.cpp
View File

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

4
Source/Core/DolphinQt/GCMemcardManager.cpp
View File

@ -230,8 +230,6 @@ void GCMemcardManager::UpdateSlotTable(int slot)
auto* icon = new QTableWidgetItem; auto* icon = new QTableWidgetItem;
icon->setData(Qt::DecorationRole, icon_data.m_frames[0]); 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)); m_slot_active_icons[slot].emplace_back(std::move(icon_data));
table->setItem(i, 0, banner); table->setItem(i, 0, banner);
@ -531,7 +529,7 @@ GCMemcardManager::IconAnimationData GCMemcardManager::GetIconFromSaveFile(int fi
if (decoded_data && !decoded_data->empty()) if (decoded_data && !decoded_data->empty())
{ {
frame_data.m_frames.reserve(decoded_data->size()); 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) for (size_t f = 0; f < decoded_data->size(); ++f)
{ {
QImage img(reinterpret_cast<const u8*>((*decoded_data)[f].image_data.data()), QImage img(reinterpret_cast<const u8*>((*decoded_data)[f].image_data.data()),

2
Source/Core/UICommon/AutoUpdate.cpp
View File

@ -43,9 +43,9 @@ const char UPDATER_RELOC_FILENAME[] = ".Dolphin Updater.2.app";
#endif #endif
#ifdef OS_SUPPORTS_UPDATER
const char UPDATER_LOG_FILE[] = "Updater.log"; const char UPDATER_LOG_FILE[] = "Updater.log";
#ifdef OS_SUPPORTS_UPDATER
std::string MakeUpdaterCommandLine(const std::map<std::string, std::string>& flags) std::string MakeUpdaterCommandLine(const std::map<std::string, std::string>& flags)
{ {
#ifdef __APPLE__ #ifdef __APPLE__