From 746c2a3ae769c6172700e4f9e10ba01fa0df4ccb Mon Sep 17 00:00:00 2001 From: bunnei Date: Sun, 15 Oct 2017 00:11:38 -0400 Subject: core: Refactor MakeMagic usage and remove dead code. --- src/citra_qt/game_list_p.h | 42 ------------------------------------------ 1 file changed, 42 deletions(-) (limited to 'src/citra_qt') diff --git a/src/citra_qt/game_list_p.h b/src/citra_qt/game_list_p.h index 12212a3a4..9881296d9 100644 --- a/src/citra_qt/game_list_p.h +++ b/src/citra_qt/game_list_p.h @@ -11,21 +11,6 @@ #include #include "citra_qt/util/util.h" #include "common/string_util.h" -#include "core/loader/smdh.h" - -/** - * Gets the game icon from SMDH data. - * @param smdh SMDH data - * @param large If true, returns large icon (48x48), otherwise returns small icon (24x24) - * @return QPixmap game icon - */ -static QPixmap GetQPixmapFromSMDH(const Loader::SMDH& smdh, bool large) { - std::vector icon_data = smdh.GetIcon(large); - const uchar* data = reinterpret_cast(icon_data.data()); - int size = large ? 48 : 24; - QImage icon(data, size, size, QImage::Format::Format_RGB16); - return QPixmap::fromImage(icon); -} /** * Gets the default icon (for games without valid SMDH) @@ -39,17 +24,6 @@ static QPixmap GetDefaultIcon(bool large) { return icon; } -/** - * Gets the short game title from SMDH data. - * @param smdh SMDH data - * @param language title language - * @return QString short title - */ -static QString GetQStringShortTitleFromSMDH(const Loader::SMDH& smdh, - Loader::SMDH::TitleLanguage language) { - return QString::fromUtf16(smdh.GetShortTitle(language).data()); -} - class GameListItem : public QStandardItem { public: @@ -76,22 +50,6 @@ public: : GameListItem() { setData(game_path, FullPathRole); setData(qulonglong(program_id), ProgramIdRole); - - if (!Loader::IsValidSMDH(smdh_data)) { - // SMDH is not valid, set a default icon - setData(GetDefaultIcon(true), Qt::DecorationRole); - return; - } - - Loader::SMDH smdh; - memcpy(&smdh, smdh_data.data(), sizeof(Loader::SMDH)); - - // Get icon from SMDH - setData(GetQPixmapFromSMDH(smdh, true), Qt::DecorationRole); - - // Get title form SMDH - setData(GetQStringShortTitleFromSMDH(smdh, Loader::SMDH::TitleLanguage::English), - TitleRole); } QVariant data(int role) const override { -- cgit v1.2.3