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

Fix 'declaration hides parameter'

Browse Source
This commit is contained in:
twinaphex 2019-07-14 13:19:24 +02:00
parent 339e043ff2
commit bcc72aca7c
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ui/drivers/qt/qt_playlist.cpp
View File

@ -265,7 +265,8 @@ inline static bool comp_hash_name_key_lower(const QHash<QString, QString> &lhs,
return lhs.value("name").toLower() < rhs.value("name").toLower(); return lhs.value("name").toLower() < rhs.value("name").toLower();
} }
bool MainWindow::addDirectoryFilesToList(QProgressDialog *dialog, QStringList &list, QDir &dir, QStringList &extensions) bool MainWindow::addDirectoryFilesToList(QProgressDialog *dialog,
QStringList &list, QDir &dir, QStringList &extensions)
{ {
PlaylistEntryDialog *playlistDialog = playlistEntryDialog(); PlaylistEntryDialog *playlistDialog = playlistEntryDialog();
QStringList dirList = dir.entryList(QStringList(), QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot | QDir::Hidden | QDir::System, QDir::Name); QStringList dirList = dir.entryList(QStringList(), QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot | QDir::Hidden | QDir::System, QDir::Name);
@ -312,16 +313,18 @@ bool MainWindow::addDirectoryFilesToList(QProgressDialog *dialog, QStringList &l
{ {
if (path_is_compressed_file(pathData)) if (path_is_compressed_file(pathData))
{ {
struct string_list *list = file_archive_get_file_list(pathData, NULL); struct string_list *archive_list =
file_archive_get_file_list(pathData, NULL);
if (list) if (archive_list)
{ {
if (list->size == 1) if (archive_list->size == 1)
{ {
/* Assume archives with one file should have that file loaded directly. /* Assume archives with one file should have that file loaded directly.
* Don't just extend this to add all files in a zip, because we might hit * Don't just extend this to add all files in a zip, because we might hit
* something like MAME/FBA where only the archives themselves are valid content. */ * something like MAME/FBA where only the archives themselves are valid content. */
pathArray = (QString(pathData) + "#" + list->elems[0].data).toUtf8(); pathArray = (QString(pathData) + "#"
+ archive_list->elems[0].data).toUtf8();
pathData = pathArray.constData(); pathData = pathArray.constData();
if (!extensions.isEmpty() && playlistDialog->filterInArchive()) if (!extensions.isEmpty() && playlistDialog->filterInArchive())
@ -333,7 +336,7 @@ bool MainWindow::addDirectoryFilesToList(QProgressDialog *dialog, QStringList &l
} }
} }
string_list_free(list); string_list_free(archive_list);
} }
} }
} }