combine font classes in one.

8 files changed, 16 insertions, 8 deletions

diff --git a/src/gui/base/widgets/button.cpp b/src/gui/base/widgets/button.cpp
index 1276b82b2..9b7473293 100644
--- a/src/gui/base/widgets/button.cpp
+++ b/src/gui/base/widgets/button.cpp
@@ -67,7 +67,8 @@
 
 #include "gui/base/widgets/button.hpp"
 
-#include "gui/base/font.hpp"
+#include "gui/font.h"
+
 #include "gui/base/key.hpp"
 #include "gui/base/mouseinput.hpp"
 
diff --git a/src/gui/base/widgets/checkbox.cpp b/src/gui/base/widgets/checkbox.cpp
index 5f2477b4d..0a3171fe8 100644
--- a/src/gui/base/widgets/checkbox.cpp
+++ b/src/gui/base/widgets/checkbox.cpp
@@ -67,7 +67,8 @@
 
 #include "gui/base/widgets/checkbox.hpp"
 
-#include "gui/base/font.hpp"
+#include "gui/font.h"
+
 #include "gui/base/key.hpp"
 #include "gui/base/mouseinput.hpp"
 
diff --git a/src/gui/base/widgets/label.cpp b/src/gui/base/widgets/label.cpp
index c23666eac..cbee2ac4c 100644
--- a/src/gui/base/widgets/label.cpp
+++ b/src/gui/base/widgets/label.cpp
@@ -67,7 +67,7 @@
 
 #include "gui/base/widgets/label.hpp"
 
-#include "gui/base/font.hpp"
+#include "gui/font.h"
 
 #include "render/graphics.h"
 
diff --git a/src/gui/base/widgets/listbox.cpp b/src/gui/base/widgets/listbox.cpp
index 7f46b4b10..6c6472636 100644
--- a/src/gui/base/widgets/listbox.cpp
+++ b/src/gui/base/widgets/listbox.cpp
@@ -67,11 +67,13 @@
 
 #include "gui/base/widgets/listbox.hpp"
 
+#include "gui/font.h"
+
 #include "gui/base/basiccontainer.hpp"
-#include "gui/base/font.hpp"
 #include "gui/base/key.hpp"
 #include "gui/base/listmodel.hpp"
 #include "gui/base/mouseinput.hpp"
+
 #include "listeners/selectionlistener.h"
 
 #include "render/graphics.h"
diff --git a/src/gui/base/widgets/radiobutton.cpp b/src/gui/base/widgets/radiobutton.cpp
index e42773de1..f0430c7a2 100644
--- a/src/gui/base/widgets/radiobutton.cpp
+++ b/src/gui/base/widgets/radiobutton.cpp
@@ -67,7 +67,8 @@
 
 #include "gui/base/widgets/radiobutton.hpp"
 
-#include "gui/base/font.hpp"
+#include "gui/font.h"
+
 #include "gui/base/key.hpp"
 #include "gui/base/mouseinput.hpp"
 
diff --git a/src/gui/base/widgets/textbox.cpp b/src/gui/base/widgets/textbox.cpp
index 06d0e6379..e994804d8 100644
--- a/src/gui/base/widgets/textbox.cpp
+++ b/src/gui/base/widgets/textbox.cpp
@@ -67,8 +67,9 @@
 
 #include "gui/base/widgets/textbox.hpp"
 
+#include "gui/font.h"
+
 #include "gui/base/basiccontainer.hpp"
-#include "gui/base/font.hpp"
 #include "gui/base/key.hpp"
 #include "gui/base/mouseinput.hpp"
 
diff --git a/src/gui/base/widgets/textfield.cpp b/src/gui/base/widgets/textfield.cpp
index df1b844d4..1514d3afb 100644
--- a/src/gui/base/widgets/textfield.cpp
+++ b/src/gui/base/widgets/textfield.cpp
@@ -67,7 +67,8 @@
 
 #include "gui/base/widgets/textfield.hpp"
 
-#include "gui/base/font.hpp"
+#include "gui/font.h"
+
 #include "gui/base/key.hpp"
 #include "gui/base/mouseinput.hpp"
 
diff --git a/src/gui/base/widgets/window.cpp b/src/gui/base/widgets/window.cpp
index 9207fe449..fbd42aff2 100644
--- a/src/gui/base/widgets/window.cpp
+++ b/src/gui/base/widgets/window.cpp
@@ -67,7 +67,8 @@
 
 #include "gui/base/widgets/window.hpp"
 
-#include "gui/base/font.hpp"
+#include "gui/font.h"
+
 #include "gui/base/mouseinput.hpp"
 
 #include "render/graphics.h"