80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

qt: Use a single loop for icon dir search

Browse Source
This commit is contained in:
cold-brewed
2022-09-12 10:10:22 -04:00
parent 3d7fdf0eda
commit dc046c5b5f
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/qt/qt_progsettings.cpp
View File

@@ -46,16 +46,12 @@ QTranslator* ProgSettings::qtTranslator = nullptr;
QString ProgSettings::getIconSetPath() QString ProgSettings::getIconSetPath()
{ {
if (iconset_to_qt.isEmpty()) { if (iconset_to_qt.isEmpty()) {
QVector<QFileInfo> roms_dirs;
// Walk rom_paths to get the candidates
for (rom_path_t *emu_rom_path = &rom_paths; emu_rom_path != nullptr; emu_rom_path = emu_rom_path->next) {
roms_dirs.append(QFileInfo(emu_rom_path->path));
}
// Always include default bundled icons // Always include default bundled icons
iconset_to_qt.insert("", ":/settings/win/icons"); iconset_to_qt.insert("", ":/settings/win/icons");
for (auto &checked_dir : roms_dirs) { // Walk rom_paths to get the candidates
for (rom_path_t *emu_rom_path = &rom_paths; emu_rom_path != nullptr; emu_rom_path = emu_rom_path->next) {
// Check for icons subdir in each candidate // Check for icons subdir in each candidate
QDir roms_icons_dir(checked_dir.filePath() + "/icons"); QDir roms_icons_dir(QString(emu_rom_path->path) + "/icons");
if (roms_icons_dir.isReadable()) { if (roms_icons_dir.isReadable()) {
auto dirList = roms_icons_dir.entryList(QDir::AllDirs | QDir::Executable | QDir::Readable); auto dirList = roms_icons_dir.entryList(QDir::AllDirs | QDir::Executable | QDir::Readable);
for (auto &curIconSet : dirList) { for (auto &curIconSet : dirList) {