From 46087564d4184b28740b0c45c1bac199ab1942ec Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 16 Mar 2014 14:14:29 +0300
Subject: Improve theme usage.

Removed instance method.
---
 src/gui/widgets/checkbox.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/gui/widgets/checkbox.cpp')

diff --git a/src/gui/widgets/checkbox.cpp b/src/gui/widgets/checkbox.cpp
index f01495bcf..c44c88980 100644
--- a/src/gui/widgets/checkbox.cpp
+++ b/src/gui/widgets/checkbox.cpp
@@ -106,9 +106,9 @@ CheckBox::CheckBox(const Widget2 *const widget,
     mForegroundColor2 = getThemeColor(Theme::CHECKBOX_OUTLINE);
     if (instances == 0)
     {
-        if (Theme::instance())
+        if (theme)
         {
-            mSkin = Theme::instance()->load("checkbox.xml", "");
+            mSkin = theme->load("checkbox.xml", "");
             updateAlpha();
         }
     }
@@ -142,8 +142,8 @@ CheckBox::~CheckBox()
 
     if (instances == 0)
     {
-        if (Theme::instance())
-            Theme::instance()->unload(mSkin);
+        if (theme)
+            theme->unload(mSkin);
     }
 }
 
@@ -162,7 +162,7 @@ void CheckBox::draw(Graphics *const graphics)
 void CheckBox::updateAlpha()
 {
     const float alpha = std::max(client->getGuiAlpha(),
-        Theme::instance()->getMinimumOpacity());
+        theme->getMinimumOpacity());
 
     if (mAlpha != alpha)
     {
-- 
cgit v1.2.3-60-g2f50