summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Lioncash2019-05-30 18:56:04 -0400
committerGravatar Lioncash2019-05-30 18:56:06 -0400
commitde2533d389bdf52ddf4faa3029c3fc95f51fed46 (patch)
treec8b17a09230a26e2a3bceefe98688af57d72e4aa /src
parentMerge pull request #1931 from DarkLordZach/mii-database-1 (diff)
downloadyuzu-de2533d389bdf52ddf4faa3029c3fc95f51fed46.tar.gz
yuzu-de2533d389bdf52ddf4faa3029c3fc95f51fed46.tar.xz
yuzu-de2533d389bdf52ddf4faa3029c3fc95f51fed46.zip
game_list_worker: Remove template specializations
This is equivalent to specifying two separate functions, so we can just do that.
Diffstat (limited to 'src')
-rw-r--r--src/yuzu/game_list_worker.cpp10
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 @@
32 32
33namespace { 33namespace {
34 34
35template <typename T>
36T GetGameListCachedObject(const std::string& filename, const std::string& ext,
37 const std::function<T()>& generator);
38
39template <>
40QString GetGameListCachedObject(const std::string& filename, const std::string& ext, 35QString GetGameListCachedObject(const std::string& filename, const std::string& ext,
41 const std::function<QString()>& generator) { 36 const std::function<QString()>& generator) {
42 if (!UISettings::values.cache_game_list || filename == "0000000000000000") { 37 if (!UISettings::values.cache_game_list || filename == "0000000000000000") {
@@ -70,7 +65,6 @@ QString GetGameListCachedObject(const std::string& filename, const std::string&
70 return generator(); 65 return generator();
71} 66}
72 67
73template <>
74std::pair<std::vector<u8>, std::string> GetGameListCachedObject( 68std::pair<std::vector<u8>, std::string> GetGameListCachedObject(
75 const std::string& filename, const std::string& ext, 69 const std::string& filename, const std::string& ext,
76 const std::function<std::pair<std::vector<u8>, std::string>()>& generator) { 70 const std::function<std::pair<std::vector<u8>, std::string>()>& generator) {
@@ -139,7 +133,7 @@ std::pair<std::vector<u8>, std::string> GetGameListCachedObject(
139 133
140void GetMetadataFromControlNCA(const FileSys::PatchManager& patch_manager, const FileSys::NCA& nca, 134void GetMetadataFromControlNCA(const FileSys::PatchManager& patch_manager, const FileSys::NCA& nca,
141 std::vector<u8>& icon, std::string& name) { 135 std::vector<u8>& icon, std::string& name) {
142 std::tie(icon, name) = GetGameListCachedObject<std::pair<std::vector<u8>, std::string>>( 136 std::tie(icon, name) = GetGameListCachedObject(
143 fmt::format("{:016X}", patch_manager.GetTitleID()), {}, [&patch_manager, &nca] { 137 fmt::format("{:016X}", patch_manager.GetTitleID()), {}, [&patch_manager, &nca] {
144 const auto [nacp, icon_f] = patch_manager.ParseControlNCA(nca); 138 const auto [nacp, icon_f] = patch_manager.ParseControlNCA(nca);
145 return std::make_pair(icon_f->ReadAllBytes(), nacp->GetApplicationName()); 139 return std::make_pair(icon_f->ReadAllBytes(), nacp->GetApplicationName());
@@ -221,7 +215,7 @@ QList<QStandardItem*> MakeGameListEntry(const std::string& path, const std::stri
221 }; 215 };
222 216
223 if (UISettings::values.show_add_ons) { 217 if (UISettings::values.show_add_ons) {
224 const auto patch_versions = GetGameListCachedObject<QString>( 218 const auto patch_versions = GetGameListCachedObject(
225 fmt::format("{:016X}", patch.GetTitleID()), "pv.txt", [&patch, &loader] { 219 fmt::format("{:016X}", patch.GetTitleID()), "pv.txt", [&patch, &loader] {
226 return FormatPatchNameVersions(patch, loader, loader.IsRomFSUpdatable()); 220 return FormatPatchNameVersions(patch, loader, loader.IsRomFSUpdatable());
227 }); 221 });