From e1a530f84dce9b4c1b262669157359fbbd436428 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Tue, 3 May 2016 00:27:28 +0200 Subject: GH-1559 Fix FTB icons This was caused by separation of GUI and logic. Now logic has an interface that GUI implements. It should be expanded upon later. --- api/gui/icons/MMCIcon.h | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'api/gui/icons/MMCIcon.h') diff --git a/api/gui/icons/MMCIcon.h b/api/gui/icons/MMCIcon.h index 6f9617c2..4bc7ecdc 100644 --- a/api/gui/icons/MMCIcon.h +++ b/api/gui/icons/MMCIcon.h @@ -17,6 +17,7 @@ #include #include #include +#include #include "multimc_gui_export.h" @@ -33,23 +34,15 @@ struct MULTIMC_GUI_EXPORT MMCImage struct MULTIMC_GUI_EXPORT MMCIcon { - enum Type : unsigned - { - Builtin, - Transient, - FileBased, - ICONS_TOTAL, - ToBeDeleted - }; QString m_key; QString m_name; MMCImage m_images[ICONS_TOTAL]; - Type m_current_type = ToBeDeleted; + IconType m_current_type = ToBeDeleted; - Type type() const; + IconType type() const; QString name() const; - bool has(Type _type) const; + bool has(IconType _type) const; QIcon icon() const; - void remove(Type rm_type); - void replace(Type new_type, QIcon icon, QString path = QString()); + void remove(IconType rm_type); + void replace(IconType new_type, QIcon icon, QString path = QString()); }; -- cgit v1.2.3