combine font classes in one.

4 files changed, 5 insertions, 5 deletions

diff --git a/src/gui/widgets/tabs/setup_colors.cpp b/src/gui/widgets/tabs/setup_colors.cpp
index 1a2bdfeae..d29c56c85 100644
--- a/src/gui/widgets/tabs/setup_colors.cpp
+++ b/src/gui/widgets/tabs/setup_colors.cpp
@@ -21,7 +21,7 @@
 
 #include "gui/widgets/tabs/setup_colors.h"
 
-#include "gui/sdlfont.h"
+#include "gui/font.h"
 #include "gui/userpalette.h"
 
 #include "gui/widgets/browserbox.h"
@@ -101,7 +101,7 @@ Setup_Colors::Setup_Colors(const Widget2 *const widget) :
     // TRANSLATORS: color type
     std::string longText = _("Static");
 
-    const gcn::Font *const font = getFont();
+    const Font *const font = getFont();
     if (getFont()->getWidth(_("Pulse")) > font->getWidth(longText))
     {
         // TRANSLATORS: color type
diff --git a/src/gui/widgets/tabs/setup_input.cpp b/src/gui/widgets/tabs/setup_input.cpp
index ba02eb5a2..22bea9a75 100644
--- a/src/gui/widgets/tabs/setup_input.cpp
+++ b/src/gui/widgets/tabs/setup_input.cpp
@@ -125,7 +125,7 @@ Setup_Input::Setup_Input(const Widget2 *const widget) :
     mKeyListModel->setSize(mActionDataSize[0]);
     refreshKeys();
     if (gui)
-        mKeyList->setFont(reinterpret_cast<gcn::Font*>(gui->getHelpFont()));
+        mKeyList->setFont(gui->getHelpFont());
     mKeyList->addActionListener(this);
 
     mScrollArea->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
diff --git a/src/gui/widgets/tabs/tab.cpp b/src/gui/widgets/tabs/tab.cpp
index a85b7927b..a097d28e2 100644
--- a/src/gui/widgets/tabs/tab.cpp
+++ b/src/gui/widgets/tabs/tab.cpp
@@ -264,7 +264,7 @@ void Tab::widgetMoved(const Event &event A_UNUSED)
     mRedraw = true;
 }
 
-void Tab::setLabelFont(gcn::Font *const font)
+void Tab::setLabelFont(Font *const font)
 {
     if (!mLabel)
         return;
diff --git a/src/gui/widgets/tabs/tab.h b/src/gui/widgets/tabs/tab.h
index d22c6bea5..655fba7ea 100644
--- a/src/gui/widgets/tabs/tab.h
+++ b/src/gui/widgets/tabs/tab.h
@@ -134,7 +134,7 @@ class Tab : public gcn::BasicContainer,
 
         void widgetMoved(const Event &event) override final;
 
-        void setLabelFont(gcn::Font *const font);
+        void setLabelFont(Font *const font);
 
         Label *getLabel() const A_WARN_UNUSED
         { return mLabel; }