From 982e066100c187a7565c43103572a987ae3766bc Mon Sep 17 00:00:00 2001
From: Andreas Kling <kling@serenityos.org>
Date: Sat, 31 Oct 2020 10:18:49 +0100
Subject: [PATCH] LibGfx: Move FontDatabase from LibGUI to LibGfx

Not sure why I put this into LibGUI in the first place.
---
 Applications/HexEditor/HexEditor.cpp          | 1 -
 Applications/HexEditor/HexEditorWidget.cpp    | 1 -
 Applications/Terminal/main.cpp                | 4 ++--
 Applications/TextEditor/TextEditorWidget.cpp  | 4 ++--
 Demos/WidgetGallery/main.cpp                  | 1 -
 Games/2048/BoardView.cpp                      | 4 ++--
 Games/Snake/SnakeGame.cpp                     | 1 -
 Libraries/LibGUI/CMakeLists.txt               | 1 -
 Libraries/LibGUI/TextEditor.cpp               | 1 -
 Libraries/LibGfx/CMakeLists.txt               | 1 +
 Libraries/{LibGUI => LibGfx}/FontDatabase.cpp | 4 ++--
 Libraries/{LibGUI => LibGfx}/FontDatabase.h   | 2 +-
 Libraries/LibVT/TerminalWidget.cpp            | 4 ++--
 13 files changed, 12 insertions(+), 17 deletions(-)
 rename Libraries/{LibGUI => LibGfx}/FontDatabase.cpp (98%)
 rename Libraries/{LibGUI => LibGfx}/FontDatabase.h (99%)

diff --git a/Applications/HexEditor/HexEditor.cpp b/Applications/HexEditor/HexEditor.cpp
index 3d96030e70..0cb11aea6e 100644
--- a/Applications/HexEditor/HexEditor.cpp
+++ b/Applications/HexEditor/HexEditor.cpp
@@ -28,7 +28,6 @@
 #include <AK/StringBuilder.h>
 #include <LibGUI/Action.h>
 #include <LibGUI/Clipboard.h>
-#include <LibGUI/FontDatabase.h>
 #include <LibGUI/Menu.h>
 #include <LibGUI/Painter.h>
 #include <LibGUI/ScrollBar.h>
diff --git a/Applications/HexEditor/HexEditorWidget.cpp b/Applications/HexEditor/HexEditorWidget.cpp
index 09c140c0b7..37d09a671c 100644
--- a/Applications/HexEditor/HexEditorWidget.cpp
+++ b/Applications/HexEditor/HexEditorWidget.cpp
@@ -33,7 +33,6 @@
 #include <LibGUI/BoxLayout.h>
 #include <LibGUI/Button.h>
 #include <LibGUI/FilePicker.h>
-#include <LibGUI/FontDatabase.h>
 #include <LibGUI/InputBox.h>
 #include <LibGUI/Menu.h>
 #include <LibGUI/MenuBar.h>
diff --git a/Applications/Terminal/main.cpp b/Applications/Terminal/main.cpp
index 2282db3dd9..956feb6791 100644
--- a/Applications/Terminal/main.cpp
+++ b/Applications/Terminal/main.cpp
@@ -30,7 +30,7 @@
 #include <LibGUI/ActionGroup.h>
 #include <LibGUI/Application.h>
 #include <LibGUI/BoxLayout.h>
-#include <LibGUI/FontDatabase.h>
+#include <LibGfx/FontDatabase.h>
 #include <LibGUI/GroupBox.h>
 #include <LibGUI/Menu.h>
 #include <LibGUI/MenuBar.h>
@@ -330,7 +330,7 @@ int main(int argc, char** argv)
     GUI::ActionGroup font_action_group;
     font_action_group.set_exclusive(true);
     auto& font_menu = menubar->add_menu("Font");
-    GUI::FontDatabase::the().for_each_fixed_width_font([&](const Gfx::Font& font) {
+    Gfx::FontDatabase::the().for_each_fixed_width_font([&](const Gfx::Font& font) {
         auto action = GUI::Action::create_checkable(font.qualified_name(), [&](auto&) {
             terminal.set_font(font);
             config->write_entry("Text", "Font", font.qualified_name());
diff --git a/Applications/TextEditor/TextEditorWidget.cpp b/Applications/TextEditor/TextEditorWidget.cpp
index dde6f1e275..43dde1c685 100644
--- a/Applications/TextEditor/TextEditorWidget.cpp
+++ b/Applications/TextEditor/TextEditorWidget.cpp
@@ -41,7 +41,6 @@
 #include <LibGUI/Button.h>
 #include <LibGUI/CppSyntaxHighlighter.h>
 #include <LibGUI/FilePicker.h>
-#include <LibGUI/FontDatabase.h>
 #include <LibGUI/INISyntaxHighlighter.h>
 #include <LibGUI/JSSyntaxHighlighter.h>
 #include <LibGUI/Menu.h>
@@ -55,6 +54,7 @@
 #include <LibGUI/ToolBar.h>
 #include <LibGUI/ToolBarContainer.h>
 #include <LibGfx/Font.h>
+#include <LibGfx/FontDatabase.h>
 #include <LibMarkdown/Document.h>
 #include <LibWeb/OutOfProcessWebView.h>
 #include <string.h>
@@ -396,7 +396,7 @@ TextEditorWidget::TextEditorWidget()
     font_actions.set_exclusive(true);
 
     auto& font_menu = view_menu.add_submenu("Font");
-    GUI::FontDatabase::the().for_each_fixed_width_font([&](const Gfx::Font& font) {
+    Gfx::FontDatabase::the().for_each_fixed_width_font([&](const Gfx::Font& font) {
         auto action = GUI::Action::create_checkable(font.qualified_name(), [&](auto&) {
             m_editor->set_font(font);
             m_editor->update();
diff --git a/Demos/WidgetGallery/main.cpp b/Demos/WidgetGallery/main.cpp
index 5047034d97..93d5175032 100644
--- a/Demos/WidgetGallery/main.cpp
+++ b/Demos/WidgetGallery/main.cpp
@@ -35,7 +35,6 @@
 #include <LibGUI/CheckBox.h>
 #include <LibGUI/ColorInput.h>
 #include <LibGUI/ComboBox.h>
-#include <LibGUI/FontDatabase.h>
 #include <LibGUI/GroupBox.h>
 #include <LibGUI/Icon.h>
 #include <LibGUI/ImageWidget.h>
diff --git a/Games/2048/BoardView.cpp b/Games/2048/BoardView.cpp
index 679596859d..230c1eedc5 100644
--- a/Games/2048/BoardView.cpp
+++ b/Games/2048/BoardView.cpp
@@ -25,9 +25,9 @@
  */
 
 #include "BoardView.h"
-#include <LibGUI/FontDatabase.h>
 #include <LibGUI/Painter.h>
 #include <LibGfx/Font.h>
+#include <LibGfx/FontDatabase.h>
 #include <LibGfx/Palette.h>
 
 BoardView::BoardView(const Game::Board* board)
@@ -63,7 +63,7 @@ void BoardView::pick_font()
 {
     String best_font_name;
     int best_font_size = -1;
-    auto& font_database = GUI::FontDatabase::the();
+    auto& font_database = Gfx::FontDatabase::the();
     font_database.for_each_font([&](const Gfx::Font& font) {
         if (font.family() != "Liza" || font.weight() != 700)
             return;
diff --git a/Games/Snake/SnakeGame.cpp b/Games/Snake/SnakeGame.cpp
index b84cfccd26..70e8f85dbf 100644
--- a/Games/Snake/SnakeGame.cpp
+++ b/Games/Snake/SnakeGame.cpp
@@ -26,7 +26,6 @@
 
 #include "SnakeGame.h"
 #include <LibCore/ConfigFile.h>
-#include <LibGUI/FontDatabase.h>
 #include <LibGUI/Painter.h>
 #include <LibGfx/Bitmap.h>
 #include <LibGfx/Font.h>
diff --git a/Libraries/LibGUI/CMakeLists.txt b/Libraries/LibGUI/CMakeLists.txt
index cc465d8ad6..8cadd07b4f 100644
--- a/Libraries/LibGUI/CMakeLists.txt
+++ b/Libraries/LibGUI/CMakeLists.txt
@@ -28,7 +28,6 @@ set(SOURCES
     FilePicker.cpp
     FileSystemModel.cpp
     FilteringProxyModel.cpp
-    FontDatabase.cpp
     Frame.cpp
     GroupBox.cpp
     HeaderView.cpp
diff --git a/Libraries/LibGUI/TextEditor.cpp b/Libraries/LibGUI/TextEditor.cpp
index f1875f6ae2..0d38c99d39 100644
--- a/Libraries/LibGUI/TextEditor.cpp
+++ b/Libraries/LibGUI/TextEditor.cpp
@@ -30,7 +30,6 @@
 #include <LibCore/Timer.h>
 #include <LibGUI/Action.h>
 #include <LibGUI/Clipboard.h>
-#include <LibGUI/FontDatabase.h>
 #include <LibGUI/InputBox.h>
 #include <LibGUI/Menu.h>
 #include <LibGUI/Painter.h>
diff --git a/Libraries/LibGfx/CMakeLists.txt b/Libraries/LibGfx/CMakeLists.txt
index b748a557f6..81545c35ff 100644
--- a/Libraries/LibGfx/CMakeLists.txt
+++ b/Libraries/LibGfx/CMakeLists.txt
@@ -9,6 +9,7 @@ set(SOURCES
     DisjointRectSet.cpp
     Emoji.cpp
     Font.cpp
+    FontDatabase.cpp
     GIFLoader.cpp
     ICOLoader.cpp
     ImageDecoder.cpp
diff --git a/Libraries/LibGUI/FontDatabase.cpp b/Libraries/LibGfx/FontDatabase.cpp
similarity index 98%
rename from Libraries/LibGUI/FontDatabase.cpp
rename to Libraries/LibGfx/FontDatabase.cpp
index 2a622e3ebd..9c8230c6d8 100644
--- a/Libraries/LibGUI/FontDatabase.cpp
+++ b/Libraries/LibGfx/FontDatabase.cpp
@@ -27,13 +27,13 @@
 #include <AK/NonnullRefPtrVector.h>
 #include <AK/QuickSort.h>
 #include <LibCore/DirIterator.h>
-#include <LibGUI/FontDatabase.h>
 #include <LibGfx/Font.h>
+#include <LibGfx/FontDatabase.h>
 #include <dirent.h>
 #include <stdio.h>
 #include <stdlib.h>
 
-namespace GUI {
+namespace Gfx {
 
 static FontDatabase* s_the;
 
diff --git a/Libraries/LibGUI/FontDatabase.h b/Libraries/LibGfx/FontDatabase.h
similarity index 99%
rename from Libraries/LibGUI/FontDatabase.h
rename to Libraries/LibGfx/FontDatabase.h
index 76b94e78c0..55d39bb415 100644
--- a/Libraries/LibGUI/FontDatabase.h
+++ b/Libraries/LibGfx/FontDatabase.h
@@ -31,7 +31,7 @@
 #include <AK/String.h>
 #include <LibGfx/Forward.h>
 
-namespace GUI {
+namespace Gfx {
 
 class FontDatabase {
 public:
diff --git a/Libraries/LibVT/TerminalWidget.cpp b/Libraries/LibVT/TerminalWidget.cpp
index 4a27091eaa..948c2f402c 100644
--- a/Libraries/LibVT/TerminalWidget.cpp
+++ b/Libraries/LibVT/TerminalWidget.cpp
@@ -39,12 +39,12 @@
 #include <LibGUI/Application.h>
 #include <LibGUI/Clipboard.h>
 #include <LibGUI/DragOperation.h>
-#include <LibGUI/FontDatabase.h>
 #include <LibGUI/Menu.h>
 #include <LibGUI/Painter.h>
 #include <LibGUI/ScrollBar.h>
 #include <LibGUI/Window.h>
 #include <LibGfx/Font.h>
+#include <LibGfx/FontDatabase.h>
 #include <LibGfx/Palette.h>
 #include <errno.h>
 #include <math.h>
@@ -122,7 +122,7 @@ TerminalWidget::TerminalWidget(int ptm_fd, bool automatic_size_policy, RefPtr<Co
     if (font_entry == "default")
         set_font(Gfx::Font::default_fixed_width_font());
     else
-        set_font(GUI::FontDatabase::the().get_by_name(font_entry));
+        set_font(Gfx::FontDatabase::the().get_by_name(font_entry));
 
     m_line_height = font().glyph_height() + m_line_spacing;