mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 04:20:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Qt: fix duplicate function name with griffin

Browse Source
This commit is contained in:
Brad Parker 2018-09-05 00:07:11 -04:00
parent 5d529f4ce4
commit c60fdf0b2e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/drivers/qt/thumbnailpackdownload.cpp
View File

@ -21,7 +21,7 @@ extern "C" {
#define THUMBNAILPACK_URL_HEADER "http://thumbnailpacks.libretro.com/" #define THUMBNAILPACK_URL_HEADER "http://thumbnailpacks.libretro.com/"
#define THUMBNAILPACK_EXTENSION ".zip" #define THUMBNAILPACK_EXTENSION ".zip"
static void extractCB(void *task_data, void *user_data, const char *err) static void extractThumbnailPackCB(void *task_data, void *user_data, const char *err)
{ {
decompress_task_data_t *dec = (decompress_task_data_t*)task_data; decompress_task_data_t *dec = (decompress_task_data_t*)task_data;
MainWindow *mainwindow = (MainWindow*)user_data; MainWindow *mainwindow = (MainWindow*)user_data;
@ -167,7 +167,7 @@ void MainWindow::onThumbnailPackDownloadFinished()
if (settings) if (settings)
{ {
RARCH_LOG("[Qt]: Thumbnail pack download finished successfully.\n"); RARCH_LOG("[Qt]: Thumbnail pack download finished successfully.\n");
emit extractArchiveDeferred(newFileName, settings->paths.directory_thumbnails, TEMP_EXTENSION, extractCB); emit extractArchiveDeferred(newFileName, settings->paths.directory_thumbnails, TEMP_EXTENSION, extractThumbnailPackCB);
} }
} }
else else

4
ui/drivers/qt/updateretroarch.cpp
View File

@ -18,7 +18,7 @@ extern "C" {
#define TEMP_EXTENSION ".update_tmp" #define TEMP_EXTENSION ".update_tmp"
#define RETROARCH_NIGHTLY_UPDATE_PATH "../RetroArch_update.zip" #define RETROARCH_NIGHTLY_UPDATE_PATH "../RetroArch_update.zip"
static void extractCB(void *task_data, void *user_data, const char *err) static void extractUpdateCB(void *task_data, void *user_data, const char *err)
{ {
decompress_task_data_t *dec = (decompress_task_data_t*)task_data; decompress_task_data_t *dec = (decompress_task_data_t*)task_data;
MainWindow *mainwindow = (MainWindow*)user_data; MainWindow *mainwindow = (MainWindow*)user_data;
@ -157,7 +157,7 @@ void MainWindow::onRetroArchUpdateDownloadFinished()
if (m_updateFile.rename(newFileName)) if (m_updateFile.rename(newFileName))
{ {
RARCH_LOG("[Qt]: RetroArch update finished downloading successfully.\n"); RARCH_LOG("[Qt]: RetroArch update finished downloading successfully.\n");
emit extractArchiveDeferred(newFileName, ".", TEMP_EXTENSION, extractCB); emit extractArchiveDeferred(newFileName, ".", TEMP_EXTENSION, extractUpdateCB);
} }
else else
{ {