summaryrefslogtreecommitdiff
path: root/src/item.cpp
diff options
context:
space:
mode:
authorBertram <bertram@cegetel.net>2010-03-06 15:53:30 +0100
committerBertram <bertram@cegetel.net>2010-03-06 15:53:30 +0100
commitda77a5f25dbf9cdfbb33ddae1c01ed961f41374f (patch)
tree7160c19d185fa8d0bf826c09c9346cdc8354e50d /src/item.cpp
parentf0bf3996fbc2f9dc3edc55b45e4fa3a3a6275db4 (diff)
parent3a447afa534573ed4a014372c687ef4028d16760 (diff)
downloadmana-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/item.cpp')
-rw-r--r--src/item.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/item.cpp b/src/item.cpp
index 378c7efe..79ccd2c3 100644
--- a/src/item.cpp
+++ b/src/item.cpp
@@ -21,7 +21,7 @@
#include "item.h"
-#include "gui/skin.h"
+#include "gui/theme.h"
#include "resources/image.h"
#include "resources/iteminfo.h"
@@ -62,8 +62,8 @@ void Item::setId(int id)
mDrawImage = resman->getImage(imagePath);
if (!mImage)
- mImage = SkinLoader::getImageFromTheme("unknown-item.png");
+ mImage = Theme::getImageFromTheme("unknown-item.png");
if (!mDrawImage)
- mDrawImage = SkinLoader::getImageFromTheme("unknown-item.png");
+ mDrawImage = Theme::getImageFromTheme("unknown-item.png");
}