diff options
| author | Bertram <bertram@cegetel.net> | 2010-03-06 15:53:30 +0100 |
|---|---|---|
| committer | Bertram <bertram@cegetel.net> | 2010-03-06 15:53:30 +0100 |
| commit | da77a5f25dbf9cdfbb33ddae1c01ed961f41374f (patch) | |
| tree | 7160c19d185fa8d0bf826c09c9346cdc8354e50d /src/gui/widgets/emoteshortcutcontainer.cpp | |
| parent | f0bf3996fbc2f9dc3edc55b45e4fa3a3a6275db4 (diff) | |
| parent | 3a447afa534573ed4a014372c687ef4028d16760 (diff) | |
| download | mana-client-da77a5f25dbf9cdfbb33ddae1c01ed961f41374f.tar.gz mana-client-da77a5f25dbf9cdfbb33ddae1c01ed961f41374f.tar.bz2 mana-client-da77a5f25dbf9cdfbb33ddae1c01ed961f41374f.tar.xz mana-client-da77a5f25dbf9cdfbb33ddae1c01ed961f41374f.zip | |
Merge branch 'master' of gitorious.org:mana/mana
Diffstat (limited to 'src/gui/widgets/emoteshortcutcontainer.cpp')
| -rw-r--r-- | src/gui/widgets/emoteshortcutcontainer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp index dd13c679..aadc6f24 100644 --- a/src/gui/widgets/emoteshortcutcontainer.cpp +++ b/src/gui/widgets/emoteshortcutcontainer.cpp @@ -32,7 +32,7 @@ #include "log.h" #include "gui/palette.h" -#include "gui/skin.h" +#include "gui/theme.h" #include "resources/emotedb.h" #include "resources/image.h" @@ -49,7 +49,7 @@ EmoteShortcutContainer::EmoteShortcutContainer(): addMouseListener(this); addWidgetListener(this); - mBackgroundImg = SkinLoader::getImageFromTheme("item_shortcut_bgr.png"); + mBackgroundImg = Theme::getImageFromTheme("item_shortcut_bgr.png"); mBackgroundImg->setAlpha(config.getValue("guialpha", 0.8)); |