Move font.cpp/h into fonts directory.

25 files changed, 49 insertions, 25 deletions

diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp
index 19eb86f44..b5d3c3593 100644
--- a/src/gui/widgets/avatarlistbox.cpp
+++ b/src/gui/widgets/avatarlistbox.cpp
@@ -27,11 +27,12 @@
 
 #include "being/localplayer.h"
 
-#include "gui/font.h"
 #include "gui/gui.h"
 #include "gui/skin.h"
 #include "gui/viewport.h"
 
+#include "gui/fonts/font.h"
+
 #include "gui/models/avatarlistmodel.h"
 
 #include "gui/windows/chatwindow.h"
diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp
index dc5bf1700..f0a10c77c 100644
--- a/src/gui/widgets/browserbox.cpp
+++ b/src/gui/widgets/browserbox.cpp
@@ -25,10 +25,11 @@
 
 #include "input/inputmanager.h"
 
-#include "gui/font.h"
 #include "gui/gui.h"
 #include "gui/skin.h"
 
+#include "gui/fonts/font.h"
+
 #include "gui/widgets/linkhandler.h"
 
 #include "resources/image.h"
diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp
index 4c806b2b0..dbed0e4ac 100644
--- a/src/gui/widgets/button.cpp
+++ b/src/gui/widgets/button.cpp
@@ -75,11 +75,12 @@
 #include "resources/image.h"
 #include "resources/imageset.h"
 
-#include "gui/font.h"
 #include "gui/gui.h"
 #include "gui/skin.h"
 #include "gui/rect.h"
 
+#include "gui/fonts/font.h"
+
 #include "utils/delete2.h"
 
 #include "debug.h"
diff --git a/src/gui/widgets/checkbox.cpp b/src/gui/widgets/checkbox.cpp
index 253092539..71936ab41 100644
--- a/src/gui/widgets/checkbox.cpp
+++ b/src/gui/widgets/checkbox.cpp
@@ -71,10 +71,11 @@
 
 #include "resources/image.h"
 
-#include "gui/font.h"
 #include "gui/gui.h"
 #include "gui/skin.h"
 
+#include "gui/fonts/font.h"
+
 #include "debug.h"
 
 int CheckBox::instances = 0;
diff --git a/src/gui/widgets/colorpage.cpp b/src/gui/widgets/colorpage.cpp
index 42d8f3016..0f71e87d7 100644
--- a/src/gui/widgets/colorpage.cpp
+++ b/src/gui/widgets/colorpage.cpp
@@ -22,9 +22,10 @@
 
 #include "gui/models/colormodel.h"
 
-#include "gui/font.h"
 #include "gui/skin.h"
 
+#include "gui/fonts/font.h"
+
 #include "debug.h"
 
 ColorPage::ColorPage(const Widget2 *const widget,
diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp
index 8de0cdc77..1cb7683e9 100644
--- a/src/gui/widgets/dropdown.cpp
+++ b/src/gui/widgets/dropdown.cpp
@@ -28,10 +28,11 @@
 
 #include "input/keydata.h"
 
-#include "gui/font.h"
 #include "gui/gui.h"
 #include "gui/skin.h"
 
+#include "gui/fonts/font.h"
+
 #include "gui/models/extendedlistmodel.h"
 
 #include "gui/widgets/popuplist.h"
diff --git a/src/gui/widgets/dropshortcutcontainer.cpp b/src/gui/widgets/dropshortcutcontainer.cpp
index 67e027a96..59528421e 100644
--- a/src/gui/widgets/dropshortcutcontainer.cpp
+++ b/src/gui/widgets/dropshortcutcontainer.cpp
@@ -28,9 +28,10 @@
 
 #include "being/playerinfo.h"
 
-#include "gui/font.h"
 #include "gui/viewport.h"
 
+#include "gui/fonts/font.h"
+
 #include "gui/popups/itempopup.h"
 
 #include "gui/windows/inventorywindow.h"
diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp
index 5331eab42..ad7bf7358 100644
--- a/src/gui/widgets/emoteshortcutcontainer.cpp
+++ b/src/gui/widgets/emoteshortcutcontainer.cpp
@@ -27,9 +27,10 @@
 
 #include "input/inputmanager.h"
 
-#include "gui/font.h"
 #include "gui/viewport.h"
 
+#include "gui/fonts/font.h"
+
 #include "gui/popups/textpopup.h"
 
 #include "resources/image.h"
diff --git a/src/gui/widgets/extendedlistbox.cpp b/src/gui/widgets/extendedlistbox.cpp
index ca58bf95b..36bcc365a 100644
--- a/src/gui/widgets/extendedlistbox.cpp
+++ b/src/gui/widgets/extendedlistbox.cpp
@@ -22,9 +22,10 @@
 
 #include "gui/models/extendedlistmodel.h"
 
-#include "gui/font.h"
 #include "gui/skin.h"
 
+#include "gui/fonts/font.h"
+
 #include "gui/models/listmodel.h"
 
 #include "render/graphics.h"
diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp
index e9d9e09bf..6f8519a3c 100644
--- a/src/gui/widgets/itemcontainer.cpp
+++ b/src/gui/widgets/itemcontainer.cpp
@@ -29,11 +29,12 @@
 
 #include "being/playerinfo.h"
 
-#include "gui/font.h"
 #include "gui/gui.h"
 #include "gui/skin.h"
 #include "gui/viewport.h"
 
+#include "gui/fonts/font.h"
+
 #include "gui/popups/itempopup.h"
 
 #include "gui/windows/chatwindow.h"
diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp
index 420eb5578..6a47b91ac 100644
--- a/src/gui/widgets/itemshortcutcontainer.cpp
+++ b/src/gui/widgets/itemshortcutcontainer.cpp
@@ -33,9 +33,10 @@
 
 #include "input/inputmanager.h"
 
-#include "gui/font.h"
 #include "gui/viewport.h"
 
+#include "gui/fonts/font.h"
+
 #include "gui/popups/itempopup.h"
 #include "gui/popups/spellpopup.h"
 
diff --git a/src/gui/widgets/label.cpp b/src/gui/widgets/label.cpp
index bfdcc3ffd..ea183e8c3 100644
--- a/src/gui/widgets/label.cpp
+++ b/src/gui/widgets/label.cpp
@@ -64,10 +64,11 @@
 
 #include "gui/widgets/label.h"
 
-#include "gui/font.h"
 #include "gui/gui.h"
 #include "gui/skin.h"
 
+#include "gui/fonts/font.h"
+
 #include "debug.h"
 
 Skin *Label::mSkin = nullptr;
diff --git a/src/gui/widgets/listbox.cpp b/src/gui/widgets/listbox.cpp
index 69d5d665f..b0e9f4236 100644
--- a/src/gui/widgets/listbox.cpp
+++ b/src/gui/widgets/listbox.cpp
@@ -72,10 +72,11 @@
 #include "listeners/selectionlistener.h"
 
 #include "gui/focushandler.h"
-#include "gui/font.h"
 #include "gui/gui.h"
 #include "gui/skin.h"
 
+#include "gui/fonts/font.h"
+
 #include "gui/models/listmodel.h"
 
 #include "debug.h"
diff --git a/src/gui/widgets/progressbar.cpp b/src/gui/widgets/progressbar.cpp
index f737f0153..6823ca050 100644
--- a/src/gui/widgets/progressbar.cpp
+++ b/src/gui/widgets/progressbar.cpp
@@ -25,10 +25,11 @@
 #include "client.h"
 #include "graphicsvertexes.h"
 
-#include "gui/font.h"
 #include "gui/gui.h"
 #include "gui/skin.h"
 
+#include "gui/fonts/font.h"
+
 #include "utils/delete2.h"
 
 #include "debug.h"
diff --git a/src/gui/widgets/radiobutton.cpp b/src/gui/widgets/radiobutton.cpp
index 8e122ece6..5f18d618f 100644
--- a/src/gui/widgets/radiobutton.cpp
+++ b/src/gui/widgets/radiobutton.cpp
@@ -71,10 +71,11 @@
 
 #include "resources/image.h"
 
-#include "gui/font.h"
 #include "gui/gui.h"
 #include "gui/skin.h"
 
+#include "gui/fonts/font.h"
+
 #include "debug.h"
 
 int RadioButton::instances = 0;
diff --git a/src/gui/widgets/serverslistbox.h b/src/gui/widgets/serverslistbox.h
index 83fab9879..03333bdb0 100644
--- a/src/gui/widgets/serverslistbox.h
+++ b/src/gui/widgets/serverslistbox.h
@@ -23,7 +23,7 @@
 #ifndef GUI_WIDGETS_SERVERSLISTBOX_H
 #define GUI_WIDGETS_SERVERSLISTBOX_H
 
-#include "gui/font.h"
+#include "gui/fonts/font.h"
 
 #include "gui/models/serverslistmodel.h"
 
diff --git a/src/gui/widgets/setupitem.cpp b/src/gui/widgets/setupitem.cpp
index 87bc2baa5..9ed8f8f08 100644
--- a/src/gui/widgets/setupitem.cpp
+++ b/src/gui/widgets/setupitem.cpp
@@ -24,9 +24,10 @@
 #include "main.h"
 #include "soundmanager.h"
 
-#include "gui/font.h"
 #include "gui/gui.h"
 
+#include "gui/fonts/font.h"
+
 #include "gui/windows/editdialog.h"
 
 #include "gui/widgets/button.h"
diff --git a/src/gui/widgets/shoplistbox.cpp b/src/gui/widgets/shoplistbox.cpp
index ce2aa5aae..9b9a6bba8 100644
--- a/src/gui/widgets/shoplistbox.cpp
+++ b/src/gui/widgets/shoplistbox.cpp
@@ -27,9 +27,10 @@
 
 #include "being/playerinfo.h"
 
-#include "gui/font.h"
 #include "gui/viewport.h"
 
+#include "gui/fonts/font.h"
+
 #include "gui/popups/itempopup.h"
 
 #include "gui/models/shopitems.h"
diff --git a/src/gui/widgets/sliderlist.cpp b/src/gui/widgets/sliderlist.cpp
index 76e6b54c3..f925dcb10 100644
--- a/src/gui/widgets/sliderlist.cpp
+++ b/src/gui/widgets/sliderlist.cpp
@@ -20,9 +20,10 @@
 
 #include "gui/widgets/sliderlist.h"
 
-#include "gui/font.h"
 #include "gui/gui.h"
 
+#include "gui/fonts/font.h"
+
 #include "gui/models/listmodel.h"
 
 #include "gui/widgets/button.h"
diff --git a/src/gui/widgets/spellshortcutcontainer.cpp b/src/gui/widgets/spellshortcutcontainer.cpp
index e86376812..3c57d1034 100644
--- a/src/gui/widgets/spellshortcutcontainer.cpp
+++ b/src/gui/widgets/spellshortcutcontainer.cpp
@@ -27,9 +27,10 @@
 #include "itemshortcut.h"
 #include "spellshortcut.h"
 
-#include "gui/font.h"
 #include "gui/viewport.h"
 
+#include "gui/fonts/font.h"
+
 #include "gui/popups/spellpopup.h"
 
 #include "gui/windows/shortcutwindow.h"
diff --git a/src/gui/widgets/tabs/setup_colors.cpp b/src/gui/widgets/tabs/setup_colors.cpp
index 83b4c6c2a..29f697ab4 100644
--- a/src/gui/widgets/tabs/setup_colors.cpp
+++ b/src/gui/widgets/tabs/setup_colors.cpp
@@ -21,10 +21,11 @@
 
 #include "gui/widgets/tabs/setup_colors.h"
 
-#include "gui/font.h"
 #include "gui/gui.h"
 #include "gui/userpalette.h"
 
+#include "gui/fonts/font.h"
+
 #include "gui/widgets/browserbox.h"
 #include "gui/widgets/containerplacer.h"
 #include "gui/widgets/label.h"
diff --git a/src/gui/widgets/textbox.cpp b/src/gui/widgets/textbox.cpp
index c03835a0e..dcb78b40a 100644
--- a/src/gui/widgets/textbox.cpp
+++ b/src/gui/widgets/textbox.cpp
@@ -67,9 +67,10 @@
 
 #include "input/keydata.h"
 
-#include "gui/font.h"
 #include "gui/gui.h"
 
+#include "gui/fonts/font.h"
+
 #include <sstream>
 
 #include "debug.h"
diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp
index 0080a8d22..2369f1c65 100644
--- a/src/gui/widgets/textfield.cpp
+++ b/src/gui/widgets/textfield.cpp
@@ -69,11 +69,12 @@
 
 #include "input/inputmanager.h"
 
-#include "gui/font.h"
 #include "gui/gui.h"
 #include "gui/skin.h"
 #include "gui/viewport.h"
 
+#include "gui/fonts/font.h"
+
 #include "gui/popups/popupmenu.h"
 
 #include "resources/image.h"
diff --git a/src/gui/widgets/textpreview.cpp b/src/gui/widgets/textpreview.cpp
index c567c5f06..e215d21b3 100644
--- a/src/gui/widgets/textpreview.cpp
+++ b/src/gui/widgets/textpreview.cpp
@@ -24,10 +24,11 @@
 
 #include "client.h"
 
-#include "gui/font.h"
 #include "gui/gui.h"
 #include "gui/skin.h"
 
+#include "gui/fonts/font.h"
+
 #include "debug.h"
 
 int TextPreview::instances = 0;
diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp
index 1348b055c..923999437 100644
--- a/src/gui/widgets/window.cpp
+++ b/src/gui/widgets/window.cpp
@@ -73,11 +73,12 @@
 #include "soundmanager.h"
 
 #include "gui/focushandler.h"
-#include "gui/font.h"
 #include "gui/gui.h"
 #include "gui/skin.h"
 #include "gui/viewport.h"
 
+#include "gui/fonts/font.h"
+
 #include "gui/widgets/containerplacer.h"
 #include "gui/widgets/layout.h"