LibGfx: Move other font-related files to LibGfx/Font/

Userland/Libraries/LibGfx/CMakeLists.txt

@@ -3,7 +3,6 @@ set(SOURCES
     AntiAliasingPainter.cpp
     Bitmap.cpp
     BitmapMixer.cpp
-    BitmapFont.cpp
     BMPLoader.cpp
     BMPWriter.cpp
     ClassicStylePainter.cpp
@@ -12,11 +11,16 @@ set(SOURCES
     CursorParams.cpp
     DDSLoader.cpp
     DisjointRectSet.cpp
-    Emoji.cpp
     Filters/ColorBlindnessFilter.cpp
     Filters/FastBoxBlurFilter.cpp
     Filters/LumaFilter.cpp
-    FontDatabase.cpp
+    Font/BitmapFont.cpp
+    Font/Emoji.cpp
+    Font/FontDatabase.cpp
+    Font/TrueType/Font.cpp
+    Font/TrueType/Glyf.cpp
+    Font/TrueType/Cmap.cpp
+    Font/Typeface.cpp
     GIFLoader.cpp
     ICOLoader.cpp
     ImageDecoder.cpp
@@ -29,22 +33,18 @@ set(SOURCES
     PNGLoader.cpp
     PNGWriter.cpp
     PPMLoader.cpp
-        Point.cpp
-        QOILoader.cpp
-        Rect.cpp
-        ShareableBitmap.cpp
-        Size.cpp
-        StylePainter.cpp
-        SystemTheme.cpp
-        TextDirection.cpp
-        TextLayout.cpp
-        Triangle.cpp
-        Font/TrueType/Font.cpp
-        Font/TrueType/Glyf.cpp
-        Font/TrueType/Cmap.cpp
-        Typeface.cpp
-        WindowTheme.cpp
-        )
+    Point.cpp
+    QOILoader.cpp
+    Rect.cpp
+    ShareableBitmap.cpp
+    Size.cpp
+    StylePainter.cpp
+    SystemTheme.cpp
+    TextDirection.cpp
+    TextLayout.cpp
+    Triangle.cpp
+    WindowTheme.cpp
+)
 
 serenity_lib(LibGfx gfx)
 target_link_libraries(LibGfx LibM LibCompress LibCore LibTextCodec LibIPC)

Userland/Libraries/LibGfx/ClassicWindowTheme.cpp

@@ -7,7 +7,7 @@
 
 #include <LibGfx/Bitmap.h>
 #include <LibGfx/ClassicWindowTheme.h>
-#include <LibGfx/FontDatabase.h>
+#include <LibGfx/Font/FontDatabase.h>
 #include <LibGfx/Painter.h>
 #include <LibGfx/Palette.h>
 #include <LibGfx/StylePainter.h>

Userland/Libraries/LibGfx/Font/BitmapFont.cpp

@@ -10,8 +10,8 @@
 #include <AK/Utf32View.h>
 #include <AK/Utf8View.h>
 #include <LibCore/FileStream.h>
-#include <LibGfx/FontDatabase.h>
-#include <LibGfx/FontStyleMapping.h>
+#include <LibGfx/Font/FontDatabase.h>
+#include <LibGfx/Font/FontStyleMapping.h>
 #include <string.h>
 
 namespace Gfx {

Userland/Libraries/LibGfx/Font/BitmapFont.h

@@ -13,7 +13,7 @@
 #include <AK/Types.h>
 #include <AK/Vector.h>
 #include <LibCore/MappedFile.h>
-#include <LibGfx/Font.h>
+#include <LibGfx/Font/Font.h>
 #include <LibGfx/Size.h>
 
 namespace Gfx {

Userland/Libraries/LibGfx/Font/Emoji.cpp

@@ -10,7 +10,7 @@
 #include <AK/String.h>
 #include <AK/Utf8View.h>
 #include <LibGfx/Bitmap.h>
-#include <LibGfx/Emoji.h>
+#include <LibGfx/Font/Emoji.h>
 
 namespace Gfx {
 

Userland/Libraries/LibGfx/Font/FontDatabase.cpp

@@ -8,10 +8,10 @@
 #include <AK/NonnullRefPtrVector.h>
 #include <AK/QuickSort.h>
 #include <LibCore/DirIterator.h>
-#include <LibGfx/Font.h>
-#include <LibGfx/FontDatabase.h>
+#include <LibGfx/Font/Font.h>
+#include <LibGfx/Font/FontDatabase.h>
 #include <LibGfx/Font/TrueType/Font.h>
-#include <LibGfx/Typeface.h>
+#include <LibGfx/Font/Typeface.h>
 #include <stdlib.h>
 
 namespace Gfx {

Userland/Libraries/LibGfx/Font/FontDatabase.h

@@ -10,8 +10,8 @@
 #include <AK/HashMap.h>
 #include <AK/OwnPtr.h>
 #include <AK/String.h>
+#include <LibGfx/Font/Typeface.h>
 #include <LibGfx/Forward.h>
-#include <LibGfx/Typeface.h>
 
 namespace Gfx {
 

Userland/Libraries/LibGfx/Font/TrueType/Font.h

@@ -11,11 +11,11 @@
 #include <AK/RefCounted.h>
 #include <AK/StringView.h>
 #include <LibGfx/Bitmap.h>
-#include <LibGfx/Font.h>
-#include <LibGfx/Size.h>
+#include <LibGfx/Font/Font.h>
 #include <LibGfx/Font/TrueType/Cmap.h>
 #include <LibGfx/Font/TrueType/Glyf.h>
 #include <LibGfx/Font/TrueType/Tables.h>
+#include <LibGfx/Size.h>
 
 #define POINTS_PER_INCH 72.0f
 #define DEFAULT_DPI 96

Userland/Libraries/LibGfx/Font/Typeface.cpp

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <LibGfx/Typeface.h>
+#include <LibGfx/Font/Typeface.h>
 
 namespace Gfx {
 

Userland/Libraries/LibGfx/Font/Typeface.h

@@ -10,8 +10,8 @@
 #include <AK/Function.h>
 #include <AK/RefCounted.h>
 #include <AK/Vector.h>
-#include <LibGfx/BitmapFont.h>
-#include <LibGfx/Font.h>
+#include <LibGfx/Font/BitmapFont.h>
+#include <LibGfx/Font/Font.h>
 #include <LibGfx/Font/TrueType/Font.h>
 
 namespace Gfx {

Userland/Libraries/LibGfx/Painter.cpp

@@ -12,9 +12,9 @@
 
 #include "Painter.h"
 #include "Bitmap.h"
-#include "Emoji.h"
-#include "Font.h"
-#include "FontDatabase.h"
+#include "Font/Emoji.h"
+#include "Font/Font.h"
+#include "Font/FontDatabase.h"
 #include "Gamma.h"
 #include <AK/Assertions.h>
 #include <AK/Debug.h>

Userland/Libraries/LibGfx/Painter.h

@@ -11,7 +11,7 @@
 #include <AK/Utf8View.h>
 #include <AK/Vector.h>
 #include <LibGfx/Color.h>
-#include <LibGfx/FontDatabase.h>
+#include <LibGfx/Font/FontDatabase.h>
 #include <LibGfx/Forward.h>
 #include <LibGfx/Point.h>
 #include <LibGfx/Rect.h>

Userland/Libraries/LibGfx/TextLayout.h

@@ -13,7 +13,7 @@
 #include <AK/Utf32View.h>
 #include <AK/Utf8View.h>
 #include <AK/Vector.h>
-#include <LibGfx/Font.h>
+#include <LibGfx/Font/Font.h>
 #include <LibGfx/Rect.h>
 #include <LibGfx/TextElision.h>
 #include <LibGfx/TextWrapping.h>