From 6e6c5b2ba399e0ed364ada843c4c759ee54de219 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 16 Feb 2014 22:17:22 +0300
Subject: combine font classes in one.

---
 src/gui/widgets/listbox.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/gui/widgets/listbox.cpp')

diff --git a/src/gui/widgets/listbox.cpp b/src/gui/widgets/listbox.cpp
index 52ff775be..537c7283c 100644
--- a/src/gui/widgets/listbox.cpp
+++ b/src/gui/widgets/listbox.cpp
@@ -28,10 +28,10 @@
 
 #include "input/keydata.h"
 
+#include "gui/font.h"
 #include "gui/gui.h"
 
 #include "gui/base/focushandler.hpp"
-#include "gui/base/font.hpp"
 #include "gui/base/listmodel.hpp"
 
 #include "render/graphics.h"
@@ -70,7 +70,7 @@ ListBox::ListBox(const Widget2 *const widget,
         mItemPadding = mSkin->getOption("itemPadding");
     }
 
-    const gcn::Font *const font = getFont();
+    const Font *const font = getFont();
     if (font)
         mRowHeight = font->getHeight() + 2 * mItemPadding;
     else
@@ -110,7 +110,7 @@ void ListBox::draw(Graphics *graphics)
 
     mHighlightColor.a = static_cast<int>(mAlpha * 255.0F);
     graphics->setColor(mHighlightColor);
-    gcn::Font *const font = getFont();
+    Font *const font = getFont();
     const int rowHeight = getRowHeight();
     const int width = mDimension.width;
 
-- 
cgit v1.2.3-60-g2f50