diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-03-24 20:42:22 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-03-24 20:42:22 +0300 |
| commit | b7bbb09d62b55bed26d432a6a2af9831c6ec9143 (patch) | |
| tree | 895bf1e0d842088282f79bbc423ca1f825880254 /src/gui/popups | |
| parent | 3920b2449e3e55c396b3a5a46f37d965d71de42e (diff) | |
| download | plus-b7bbb09d62b55bed26d432a6a2af9831c6ec9143.tar.gz plus-b7bbb09d62b55bed26d432a6a2af9831c6ec9143.tar.bz2 plus-b7bbb09d62b55bed26d432a6a2af9831c6ec9143.tar.xz plus-b7bbb09d62b55bed26d432a6a2af9831c6ec9143.zip | |
Change ItemType into strong typed enum.
Diffstat (limited to 'src/gui/popups')
| -rw-r--r-- | src/gui/popups/itempopup.cpp | 2 | ||||
| -rw-r--r-- | src/gui/popups/itempopup.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/popups/itempopup.cpp b/src/gui/popups/itempopup.cpp index f0ab5d167..065704cb8 100644 --- a/src/gui/popups/itempopup.cpp +++ b/src/gui/popups/itempopup.cpp @@ -325,7 +325,7 @@ std::string ItemPopup::getCardsString(const int *const cards) return label->setForegroundColorAll(getThemeColor(name2), \ getThemeColor(name2##_OUTLINE)); \ } -void ItemPopup::setLabelColor(Label *label, const ItemType::Type type) const +void ItemPopup::setLabelColor(Label *label, const ItemTypeT type) const { switch (type) { diff --git a/src/gui/popups/itempopup.h b/src/gui/popups/itempopup.h index 7f5481627..fc0320614 100644 --- a/src/gui/popups/itempopup.h +++ b/src/gui/popups/itempopup.h @@ -82,14 +82,14 @@ class ItemPopup final : public Popup TextBox *mItemEffect A_NONNULLPOINTER; TextBox *mItemWeight A_NONNULLPOINTER; TextBox *mItemCards A_NONNULLPOINTER; - ItemType::Type mItemType; + ItemTypeT mItemType; Icon *mIcon A_NONNULLPOINTER; std::string mLastName; int mLastId; ItemColor mLastColor; void setLabelColor(Label *label, - const ItemType::Type type) const A_NONNULL(2); + const ItemTypeT type) const A_NONNULL(2); }; extern ItemPopup *itemPopup; |