LibGfx: Move TTF files from TrueTypeFont/ to Font/TrueType/

12 files changed, 30 insertions, 30 deletions

diff --git a/Userland/Libraries/LibGfx/CMakeLists.txt b/Userland/Libraries/LibGfx/CMakeLists.txt
index ad6bddf71d..ff1aeb44da 100644
--- a/Userland/Libraries/LibGfx/CMakeLists.txt
+++ b/Userland/Libraries/LibGfx/CMakeLists.txt
@@ -29,22 +29,22 @@ 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
-    TrueTypeFont/Font.cpp
-    TrueTypeFont/Glyf.cpp
-    TrueTypeFont/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
+        Font/TrueType/Font.cpp
+        Font/TrueType/Glyf.cpp
+        Font/TrueType/Cmap.cpp
+        Typeface.cpp
+        WindowTheme.cpp
+        )
 
 serenity_lib(LibGfx gfx)
 target_link_libraries(LibGfx LibM LibCompress LibCore LibTextCodec LibIPC)
diff --git a/Userland/Libraries/LibGfx/TrueTypeFont/Cmap.cpp b/Userland/Libraries/LibGfx/Font/TrueType/Cmap.cpp
index e2e360c276..f37eea9691 100644
--- a/Userland/Libraries/LibGfx/TrueTypeFont/Cmap.cpp
+++ b/Userland/Libraries/LibGfx/Font/TrueType/Cmap.cpp
@@ -5,7 +5,7 @@
  */
 
 #include <AK/Optional.h>
-#include <LibGfx/TrueTypeFont/Cmap.h>
+#include <LibGfx/Font/TrueType/Cmap.h>
 
 namespace TTF {
 
diff --git a/Userland/Libraries/LibGfx/TrueTypeFont/Cmap.h b/Userland/Libraries/LibGfx/Font/TrueType/Cmap.h
index 64eea73662..64eea73662 100644
--- a/Userland/Libraries/LibGfx/TrueTypeFont/Cmap.h
+++ b/Userland/Libraries/LibGfx/Font/TrueType/Cmap.h
diff --git a/Userland/Libraries/LibGfx/TrueTypeFont/Font.cpp b/Userland/Libraries/LibGfx/Font/TrueType/Font.cpp
index f6d43eb052..2cf2dea9d0 100644
--- a/Userland/Libraries/LibGfx/TrueTypeFont/Font.cpp
+++ b/Userland/Libraries/LibGfx/Font/TrueType/Font.cpp
@@ -11,10 +11,10 @@
 #include <AK/Utf32View.h>
 #include <AK/Utf8View.h>
 #include <LibCore/MappedFile.h>
-#include <LibGfx/TrueTypeFont/Cmap.h>
-#include <LibGfx/TrueTypeFont/Font.h>
-#include <LibGfx/TrueTypeFont/Glyf.h>
-#include <LibGfx/TrueTypeFont/Tables.h>
+#include <LibGfx/Font/TrueType/Cmap.h>
+#include <LibGfx/Font/TrueType/Font.h>
+#include <LibGfx/Font/TrueType/Glyf.h>
+#include <LibGfx/Font/TrueType/Tables.h>
 #include <LibTextCodec/Decoder.h>
 #include <math.h>
 #include <sys/mman.h>
diff --git a/Userland/Libraries/LibGfx/TrueTypeFont/Font.h b/Userland/Libraries/LibGfx/Font/TrueType/Font.h
index 40262aa1d1..6e037188e5 100644
--- a/Userland/Libraries/LibGfx/TrueTypeFont/Font.h
+++ b/Userland/Libraries/LibGfx/Font/TrueType/Font.h
@@ -13,9 +13,9 @@
 #include <LibGfx/Bitmap.h>
 #include <LibGfx/Font.h>
 #include <LibGfx/Size.h>
-#include <LibGfx/TrueTypeFont/Cmap.h>
-#include <LibGfx/TrueTypeFont/Glyf.h>
-#include <LibGfx/TrueTypeFont/Tables.h>
+#include <LibGfx/Font/TrueType/Cmap.h>
+#include <LibGfx/Font/TrueType/Glyf.h>
+#include <LibGfx/Font/TrueType/Tables.h>
 
 #define POINTS_PER_INCH 72.0f
 #define DEFAULT_DPI 96
diff --git a/Userland/Libraries/LibGfx/TrueTypeFont/Glyf.cpp b/Userland/Libraries/LibGfx/Font/TrueType/Glyf.cpp
index e2063ef25c..1b25f9c644 100644
--- a/Userland/Libraries/LibGfx/TrueTypeFont/Glyf.cpp
+++ b/Userland/Libraries/LibGfx/Font/TrueType/Glyf.cpp
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
+#include <LibGfx/Font/TrueType/Glyf.h>
 #include <LibGfx/Path.h>
 #include <LibGfx/Point.h>
-#include <LibGfx/TrueTypeFont/Glyf.h>
 
 namespace TTF {
 
diff --git a/Userland/Libraries/LibGfx/TrueTypeFont/Glyf.h b/Userland/Libraries/LibGfx/Font/TrueType/Glyf.h
index 5863df25e8..ef4de03ac0 100644
--- a/Userland/Libraries/LibGfx/TrueTypeFont/Glyf.h
+++ b/Userland/Libraries/LibGfx/Font/TrueType/Glyf.h
@@ -10,7 +10,7 @@
 #include <AK/Vector.h>
 #include <LibGfx/AffineTransform.h>
 #include <LibGfx/Bitmap.h>
-#include <LibGfx/TrueTypeFont/Tables.h>
+#include <LibGfx/Font/TrueType/Tables.h>
 #include <math.h>
 
 namespace TTF {
diff --git a/Userland/Libraries/LibGfx/TrueTypeFont/Tables.h b/Userland/Libraries/LibGfx/Font/TrueType/Tables.h
index 73cbf998f9..73cbf998f9 100644
--- a/Userland/Libraries/LibGfx/TrueTypeFont/Tables.h
+++ b/Userland/Libraries/LibGfx/Font/TrueType/Tables.h
diff --git a/Userland/Libraries/LibGfx/FontDatabase.cpp b/Userland/Libraries/LibGfx/FontDatabase.cpp
index 9a7645a17f..22c867301b 100644
--- a/Userland/Libraries/LibGfx/FontDatabase.cpp
+++ b/Userland/Libraries/LibGfx/FontDatabase.cpp
@@ -10,7 +10,7 @@
 #include <LibCore/DirIterator.h>
 #include <LibGfx/Font.h>
 #include <LibGfx/FontDatabase.h>
-#include <LibGfx/TrueTypeFont/Font.h>
+#include <LibGfx/Font/TrueType/Font.h>
 #include <LibGfx/Typeface.h>
 #include <stdlib.h>
 
diff --git a/Userland/Libraries/LibGfx/Typeface.h b/Userland/Libraries/LibGfx/Typeface.h
index fb2600862d..052baf98d3 100644
--- a/Userland/Libraries/LibGfx/Typeface.h
+++ b/Userland/Libraries/LibGfx/Typeface.h
@@ -12,7 +12,7 @@
 #include <AK/Vector.h>
 #include <LibGfx/BitmapFont.h>
 #include <LibGfx/Font.h>
-#include <LibGfx/TrueTypeFont/Font.h>
+#include <LibGfx/Font/TrueType/Font.h>
 
 namespace Gfx {
 
diff --git a/Userland/Libraries/LibPDF/Fonts/TrueTypeFont.h b/Userland/Libraries/LibPDF/Fonts/TrueTypeFont.h
index 87c0f6f86e..ffef41717e 100644
--- a/Userland/Libraries/LibPDF/Fonts/TrueTypeFont.h
+++ b/Userland/Libraries/LibPDF/Fonts/TrueTypeFont.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <LibGfx/TrueTypeFont/Font.h>
+#include <LibGfx/Font/TrueType/Font.h>
 #include <LibPDF/Fonts/Type1Font.h>
 
 namespace PDF {
diff --git a/Userland/Libraries/LibWeb/CSS/StyleComputer.cpp b/Userland/Libraries/LibWeb/CSS/StyleComputer.cpp
index d3074d4c5a..1e0dff24ad 100644
--- a/Userland/Libraries/LibWeb/CSS/StyleComputer.cpp
+++ b/Userland/Libraries/LibWeb/CSS/StyleComputer.cpp
@@ -12,7 +12,7 @@
 #include <LibGfx/Font.h>
 #include <LibGfx/FontDatabase.h>
 #include <LibGfx/FontStyleMapping.h>
-#include <LibGfx/TrueTypeFont/Font.h>
+#include <LibGfx/Font/TrueType/Font.h>
 #include <LibWeb/CSS/CSSFontFaceRule.h>
 #include <LibWeb/CSS/CSSStyleRule.h>
 #include <LibWeb/CSS/Parser/Parser.h>