diff options
author | Lioncash <mathew1800@gmail.com> | 2019-05-31 00:56:04 +0200 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2019-05-31 00:56:06 +0200 |
commit | de2533d389bdf52ddf4faa3029c3fc95f51fed46 (patch) | |
tree | c8b17a09230a26e2a3bceefe98688af57d72e4aa | |
parent | Merge pull request #1931 from DarkLordZach/mii-database-1 (diff) | |
download | yuzu-de2533d389bdf52ddf4faa3029c3fc95f51fed46.tar yuzu-de2533d389bdf52ddf4faa3029c3fc95f51fed46.tar.gz yuzu-de2533d389bdf52ddf4faa3029c3fc95f51fed46.tar.bz2 yuzu-de2533d389bdf52ddf4faa3029c3fc95f51fed46.tar.lz yuzu-de2533d389bdf52ddf4faa3029c3fc95f51fed46.tar.xz yuzu-de2533d389bdf52ddf4faa3029c3fc95f51fed46.tar.zst yuzu-de2533d389bdf52ddf4faa3029c3fc95f51fed46.zip |
-rw-r--r-- | src/yuzu/game_list_worker.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/yuzu/game_list_worker.cpp b/src/yuzu/game_list_worker.cpp index 4d951a4e7..1ccabed59 100644 --- a/src/yuzu/game_list_worker.cpp +++ b/src/yuzu/game_list_worker.cpp @@ -32,11 +32,6 @@ namespace { -template <typename T> -T GetGameListCachedObject(const std::string& filename, const std::string& ext, - const std::function<T()>& generator); - -template <> QString GetGameListCachedObject(const std::string& filename, const std::string& ext, const std::function<QString()>& generator) { if (!UISettings::values.cache_game_list || filename == "0000000000000000") { @@ -70,7 +65,6 @@ QString GetGameListCachedObject(const std::string& filename, const std::string& return generator(); } -template <> std::pair<std::vector<u8>, std::string> GetGameListCachedObject( const std::string& filename, const std::string& ext, const std::function<std::pair<std::vector<u8>, std::string>()>& generator) { @@ -139,7 +133,7 @@ std::pair<std::vector<u8>, std::string> GetGameListCachedObject( void GetMetadataFromControlNCA(const FileSys::PatchManager& patch_manager, const FileSys::NCA& nca, std::vector<u8>& icon, std::string& name) { - std::tie(icon, name) = GetGameListCachedObject<std::pair<std::vector<u8>, std::string>>( + std::tie(icon, name) = GetGameListCachedObject( fmt::format("{:016X}", patch_manager.GetTitleID()), {}, [&patch_manager, &nca] { const auto [nacp, icon_f] = patch_manager.ParseControlNCA(nca); return std::make_pair(icon_f->ReadAllBytes(), nacp->GetApplicationName()); @@ -221,7 +215,7 @@ QList<QStandardItem*> MakeGameListEntry(const std::string& path, const std::stri }; if (UISettings::values.show_add_ons) { - const auto patch_versions = GetGameListCachedObject<QString>( + const auto patch_versions = GetGameListCachedObject( fmt::format("{:016X}", patch.GetTitleID()), "pv.txt", [&patch, &loader] { return FormatPatchNameVersions(patch, loader, loader.IsRomFSUpdatable()); }); |