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/desktop.cpp | |
| parent | cf9b1182f06b1336f0d1071c267ea36c990430fa (diff) | |
| download | manaplus-46087564d4184b28740b0c45c1bac199ab1942ec.tar.gz manaplus-46087564d4184b28740b0c45c1bac199ab1942ec.tar.bz2 manaplus-46087564d4184b28740b0c45c1bac199ab1942ec.tar.xz manaplus-46087564d4184b28740b0c45c1bac199ab1942ec.zip | |
Improve theme usage.
Removed instance method.
Diffstat (limited to 'src/gui/widgets/desktop.cpp')
| -rw-r--r-- | src/gui/widgets/desktop.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gui/widgets/desktop.cpp b/src/gui/widgets/desktop.cpp index 0ff1b17c9..6ae892c81 100644 --- a/src/gui/widgets/desktop.cpp +++ b/src/gui/widgets/desktop.cpp @@ -51,7 +51,6 @@ Desktop::Desktop(const Widget2 *const widget) : Wallpaper::loadWallpapers(); - Theme *const theme = Theme::instance(); if (theme) mSkin = theme->load("desktop.xml", ""); @@ -80,8 +79,8 @@ Desktop::~Desktop() mWallpaper->decRef(); mWallpaper = nullptr; } - if (Theme::instance()) - Theme::instance()->unload(mSkin); + if (theme) + theme->unload(mSkin); } void Desktop::postInit() |