From 80daea54fa6b296b8dda3d847b326f9857c11438 Mon Sep 17 00:00:00 2001 From: lisyarus Date: Wed, 6 Aug 2025 17:53:00 +0300 Subject: [PATCH] Move old font classes to an inline fonts::v1 namespace --- libs/fonts/include/psemek/fonts/font.hpp | 2 +- libs/fonts/include/psemek/fonts/kerned_font.hpp | 2 +- libs/fonts/include/psemek/fonts/msdf_font.hpp | 2 +- libs/fonts/source/default_fonts.cpp | 2 +- libs/fonts/source/kerned_font.cpp | 2 +- libs/fonts/source/msdf_font.cpp | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libs/fonts/include/psemek/fonts/font.hpp b/libs/fonts/include/psemek/fonts/font.hpp index a70f77fc..1b73bd7c 100644 --- a/libs/fonts/include/psemek/fonts/font.hpp +++ b/libs/fonts/include/psemek/fonts/font.hpp @@ -11,7 +11,7 @@ #include #include -namespace psemek::fonts +namespace psemek::fonts::inline v1 { enum class font_type diff --git a/libs/fonts/include/psemek/fonts/kerned_font.hpp b/libs/fonts/include/psemek/fonts/kerned_font.hpp index 79ce1a47..0eaa75be 100644 --- a/libs/fonts/include/psemek/fonts/kerned_font.hpp +++ b/libs/fonts/include/psemek/fonts/kerned_font.hpp @@ -3,7 +3,7 @@ #include #include -namespace psemek::fonts +namespace psemek::fonts::inline v1 { struct kerned_font diff --git a/libs/fonts/include/psemek/fonts/msdf_font.hpp b/libs/fonts/include/psemek/fonts/msdf_font.hpp index 3963d5be..4d8254c4 100644 --- a/libs/fonts/include/psemek/fonts/msdf_font.hpp +++ b/libs/fonts/include/psemek/fonts/msdf_font.hpp @@ -3,7 +3,7 @@ #include #include -namespace psemek::fonts +namespace psemek::fonts::inline v1 { struct msdf_font diff --git a/libs/fonts/source/default_fonts.cpp b/libs/fonts/source/default_fonts.cpp index d04973a2..0ede52fc 100644 --- a/libs/fonts/source/default_fonts.cpp +++ b/libs/fonts/source/default_fonts.cpp @@ -13,7 +13,7 @@ #include -namespace psemek::fonts +namespace psemek::fonts::inline v1 { std::unique_ptr make_default_monospace_9x12_font() diff --git a/libs/fonts/source/kerned_font.cpp b/libs/fonts/source/kerned_font.cpp index 0e8b2846..8ded8d5d 100644 --- a/libs/fonts/source/kerned_font.cpp +++ b/libs/fonts/source/kerned_font.cpp @@ -3,7 +3,7 @@ #include #include -namespace psemek::fonts +namespace psemek::fonts::inline v1 { kerned_font::kerned_font(bmfont_data data, gfx::texture_2d atlas) diff --git a/libs/fonts/source/msdf_font.cpp b/libs/fonts/source/msdf_font.cpp index 43678560..ee8765b9 100644 --- a/libs/fonts/source/msdf_font.cpp +++ b/libs/fonts/source/msdf_font.cpp @@ -1,7 +1,7 @@ #include #include -namespace psemek::fonts +namespace psemek::fonts::inline v1 { std::unique_ptr make_msdf_font(io::istream && description, io::istream && texture)