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

Author: https://github.com/skyrising Commit: https://github.com/SerenityOS/serenity/commit/6f8fd91f22 Pull-request: https://github.com/SerenityOS/serenity/pull/13595
2024-08-16 17:00:35 +03:00 · 2022-04-09 08:52:59 +02:00 · 2022-04-09 08:52:59 +02:00 · 6f8fd91f22 · 2024-07-17 14:13:01 +09:00
commit 6f8fd91f22
parent e84bbfed44
15 changed files with 36 additions and 36 deletions
--- a/Meta/Lagom/CMakeLists.txt
+++ b/Meta/Lagom/CMakeLists.txt
@ -340,11 +340,11 @@ if (BUILD_LAGOM)

    # Gfx
    file(GLOB LIBGFX_SOURCES CONFIGURE_DEPENDS "../../Userland/Libraries/LibGfx/*.cpp")
-    file(GLOB LIBGFX_TTF_SOURCES CONFIGURE_DEPENDS "../../Userland/Libraries/LibGfx/TrueTypeFont/*.cpp")
+    file(GLOB LIBGFX_TTF_SOURCES CONFIGURE_DEPENDS "../../Userland/Libraries/LibGfx/Font/TrueType/*.cpp")
    lagom_lib(Gfx gfx
-        SOURCES ${LIBGFX_SOURCES} ${LIBGFX_TTF_SOURCES}
-        LIBS m LagomCompress LagomTextCodec LagomIPC
-    )
+            SOURCES ${LIBGFX_SOURCES} ${LIBGFX_TTF_SOURCES}
+            LIBS m LagomCompress LagomTextCodec LagomIPC
+            )

    # GPU
    file(GLOB LIBGPU_SOURCES CONFIGURE_DEPENDS "../../Userland/Libraries/LibGPU/*.cpp")
--- a/Meta/Lagom/Fuzzers/FuzzTTF.cpp
+++ b/Meta/Lagom/Fuzzers/FuzzTTF.cpp
@ -4,7 +4,7 @@
 * SPDX-License-Identifier: BSD-2-Clause
 */

-#include <LibGfx/TrueTypeFont/Font.h>
+#include <LibGfx/Font/TrueType/Font.h>
 #include <stddef.h>
 #include <stdint.h>

--- a/Tests/LibTTF/TestCmap.cpp
+++ b/Tests/LibTTF/TestCmap.cpp
@ -4,7 +4,7 @@
 * SPDX-License-Identifier: BSD-2-Clause
 */

-#include <LibGfx/TrueTypeFont/Cmap.h>
+#include <LibGfx/Font/TrueType/Cmap.h>
 #include <LibTest/TestCase.h>

 TEST_CASE(test_cmap_format_4)
--- 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)
--- a/Userland/Libraries/LibGfx/Font/TrueType/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 {

--- a/Userland/Libraries/LibGfx/Font/TrueType/Cmap.h
+++ b/Userland/Libraries/LibGfx/Font/TrueType/Cmap.h
--- a/Userland/Libraries/LibGfx/Font/TrueType/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>
--- a/Userland/Libraries/LibGfx/Font/TrueType/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
--- a/Userland/Libraries/LibGfx/Font/TrueType/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 {

--- a/Userland/Libraries/LibGfx/Font/TrueType/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 {
--- a/Userland/Libraries/LibGfx/Font/TrueType/Tables.h
+++ b/Userland/Libraries/LibGfx/Font/TrueType/Tables.h
--- 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>

--- 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 {

--- 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 {
--- 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>