summaryrefslogtreecommitdiff
path: root/src/gui/widgets/spellshortcutcontainer.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-02-16 22:17:22 +0300
committerAndrei Karas <akaras@inbox.ru>2014-02-16 22:17:22 +0300
commit6e6c5b2ba399e0ed364ada843c4c759ee54de219 (patch)
tree562e6a840c856ba8c4d35c6806020289c65d54d2 /src/gui/widgets/spellshortcutcontainer.cpp
parent82ac4641828ec7387863bb18cf4493190c4cc68f (diff)
downloadManaVerse-6e6c5b2ba399e0ed364ada843c4c759ee54de219.tar.gz
ManaVerse-6e6c5b2ba399e0ed364ada843c4c759ee54de219.tar.bz2
ManaVerse-6e6c5b2ba399e0ed364ada843c4c759ee54de219.tar.xz
ManaVerse-6e6c5b2ba399e0ed364ada843c4c759ee54de219.zip
combine font classes in one.
Diffstat (limited to 'src/gui/widgets/spellshortcutcontainer.cpp')
-rw-r--r--src/gui/widgets/spellshortcutcontainer.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gui/widgets/spellshortcutcontainer.cpp b/src/gui/widgets/spellshortcutcontainer.cpp
index 511360b91..e8d34c9d8 100644
--- a/src/gui/widgets/spellshortcutcontainer.cpp
+++ b/src/gui/widgets/spellshortcutcontainer.cpp
@@ -27,6 +27,7 @@
#include "itemshortcut.h"
#include "spellshortcut.h"
+#include "gui/font.h"
#include "gui/viewport.h"
#include "gui/popups/spellpopup.h"
@@ -36,8 +37,6 @@
#include "resources/image.h"
-#include "gui/base/font.hpp"
-
#include "debug.h"
SpellShortcutContainer::SpellShortcutContainer(const unsigned number) :
@@ -103,7 +102,7 @@ void SpellShortcutContainer::draw(Graphics *graphics)
mBackgroundImg->setAlpha(mAlpha);
}
- gcn::Font *const font = getFont();
+ Font *const font = getFont();
const int selectedId = spellShortcut->getSelectedItem();
graphics->setColorAll(mForegroundColor, mForegroundColor2);