summaryrefslogtreecommitdiff
path: root/src/gui/emotepopup.cpp
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2010-03-05 07:39:43 -0700
committerJared Adams <jaxad0127@gmail.com>2010-03-05 07:58:02 -0700
commit78ab7c7a2877efd245293ad00cd36bcaa8646507 (patch)
tree28ea749d784a3dbee334f6a076a7ac77bc0333e1 /src/gui/emotepopup.cpp
parentb60e6d82d6e843f9e65c81555ec281d237c3ce41 (diff)
downloadmana-78ab7c7a2877efd245293ad00cd36bcaa8646507.tar.gz
mana-78ab7c7a2877efd245293ad00cd36bcaa8646507.tar.bz2
mana-78ab7c7a2877efd245293ad00cd36bcaa8646507.tar.xz
mana-78ab7c7a2877efd245293ad00cd36bcaa8646507.zip
Rename SkinLoader to Theme
Also merge the guialpha ConfigListener into Theme. Reviewed-by: Thorbjørn Lindeijer
Diffstat (limited to 'src/gui/emotepopup.cpp')
-rw-r--r--src/gui/emotepopup.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/emotepopup.cpp b/src/gui/emotepopup.cpp
index 2161e04c..7c05e263 100644
--- a/src/gui/emotepopup.cpp
+++ b/src/gui/emotepopup.cpp
@@ -29,7 +29,7 @@
#include "localplayer.h"
#include "log.h"
-#include "gui/skin.h"
+#include "gui/theme.h"
#include "resources/emotedb.h"
#include "resources/image.h"
@@ -57,7 +57,7 @@ EmotePopup::EmotePopup():
mEmotes.push_back(EmoteDB::getAnimation(i));
}
- mSelectionImage = SkinLoader::getImageFromTheme("selection.png");
+ mSelectionImage = Theme::getImageFromTheme("selection.png");
if (!mSelectionImage)
logger->error("Unable to load selection.png");