diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-03-16 14:14:29 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-03-16 14:14:29 +0300 |
| commit | 46087564d4184b28740b0c45c1bac199ab1942ec (patch) | |
| tree | 0591b36aba2ae392eb569828930f030850cbc769 /src/gui/widgets/itemcontainer.cpp | |
| parent | cf9b1182f06b1336f0d1071c267ea36c990430fa (diff) | |
| download | ManaVerse-46087564d4184b28740b0c45c1bac199ab1942ec.tar.gz ManaVerse-46087564d4184b28740b0c45c1bac199ab1942ec.tar.bz2 ManaVerse-46087564d4184b28740b0c45c1bac199ab1942ec.tar.xz ManaVerse-46087564d4184b28740b0c45c1bac199ab1942ec.zip | |
Improve theme usage.
Removed instance method.
Diffstat (limited to 'src/gui/widgets/itemcontainer.cpp')
| -rw-r--r-- | src/gui/widgets/itemcontainer.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp index fe666e6f7..ecabc226f 100644 --- a/src/gui/widgets/itemcontainer.cpp +++ b/src/gui/widgets/itemcontainer.cpp @@ -168,8 +168,7 @@ ItemContainer::ItemContainer(const Widget2 *const widget, mName(), mItemPopup(new ItemPopup), mShowMatrix(nullptr), - mSkin(Theme::instance() ? Theme::instance()->load( - "itemcontainer.xml", "") : nullptr), + mSkin(theme ? theme->load("itemcontainer.xml", "") : nullptr), mEquipedColor(getThemeColor(Theme::ITEM_EQUIPPED)), mEquipedColor2(getThemeColor(Theme::ITEM_EQUIPPED_OUTLINE)), mUnEquipedColor(getThemeColor(Theme::ITEM_NOT_EQUIPPED)), @@ -215,8 +214,8 @@ ItemContainer::~ItemContainer() mProtectedImg = nullptr; } - if (Theme::instance()) - Theme::instance()->unload(mSkin); + if (theme) + theme->unload(mSkin); delete mItemPopup; mItemPopup = nullptr; |