From 99f6be43458a2339186cc527d979ec9f0bbad313 Mon Sep 17 00:00:00 2001 From: Fredrik Roubert Date: Tue, 5 Dec 2023 23:40:52 +0100 Subject: [PATCH] ICU-22593 Add missing layout/ prefix for Layout Engine header files. --- icu4c/source/samples/layout/Makefile.in | 2 +- icu4c/source/samples/layout/gnomeglue.cpp | 6 +++--- icu4c/source/samples/layout/gnomeglue.h | 4 ++-- icu4c/source/samples/layout/rsurface.cpp | 6 +++--- icu4c/source/samples/layout/rsurface.h | 2 +- icu4c/source/samples/layout/sfnt.h | 2 +- icu4c/source/test/letest/FontObject.cpp | 4 ++-- icu4c/source/test/letest/FontObject.h | 2 +- icu4c/source/test/letest/SimpleFontInstance.cpp | 2 +- icu4c/source/test/letest/testdata.cpp | 4 ++-- icu4c/source/test/perf/leperf/FontObject.cpp | 4 ++-- icu4c/source/test/perf/leperf/FontObject.h | 2 +- icu4c/source/test/perf/leperf/Makefile.in | 2 +- icu4c/source/test/perf/leperf/cfonts.cpp | 4 ++-- icu4c/source/test/perf/leperf/xmlreader.h | 2 +- 15 files changed, 24 insertions(+), 24 deletions(-) diff --git a/icu4c/source/samples/layout/Makefile.in b/icu4c/source/samples/layout/Makefile.in index a8c4a244764c..6f3be57655c7 100644 --- a/icu4c/source/samples/layout/Makefile.in +++ b/icu4c/source/samples/layout/Makefile.in @@ -26,7 +26,7 @@ CLEANFILES = *~ $(DEPS) TARGET = gnomelayout CTARGET = cgnomelayout -CPPFLAGS += -DLE_USE_CMEMORY `pkg-config --cflags libgnomeui-2.0 freetype2 cairo` -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/layoutex -I$(top_srcdir)/layout -I$(top_srcdir) -g +CPPFLAGS += -DLE_USE_CMEMORY `pkg-config --cflags libgnomeui-2.0 freetype2 cairo` -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/layoutex -I$(top_srcdir) -g LIBS = $(LIBICULX) $(LIBICULE) $(LIBICUUC) $(LIBICUI18N) @LIBS@ @LIB_M@ `pkg-config --libs libgnomeui-2.0 freetype2 cairo` diff --git a/icu4c/source/samples/layout/gnomeglue.cpp b/icu4c/source/samples/layout/gnomeglue.cpp index 2ee545706b43..54540ce05a73 100644 --- a/icu4c/source/samples/layout/gnomeglue.cpp +++ b/icu4c/source/samples/layout/gnomeglue.cpp @@ -12,14 +12,14 @@ #include FT_FREETYPE_H #include "unicode/utypes.h" -#include "loengine.h" +#include "layout/loengine.h" #include "rsurface.h" #include "gsupport.h" #include "gnomeglue.h" -#include "LETypes.h" -#include "LEFontInstance.h" +#include "layout/LETypes.h" +#include "layout/LEFontInstance.h" #include "GnomeGUISupport.h" #include "GnomeFontMap.h" #include "GnomeFontInstance.h" diff --git a/icu4c/source/samples/layout/gnomeglue.h b/icu4c/source/samples/layout/gnomeglue.h index 13e434e1acea..428d7cfc7128 100644 --- a/icu4c/source/samples/layout/gnomeglue.h +++ b/icu4c/source/samples/layout/gnomeglue.h @@ -16,8 +16,8 @@ #include "unicode/utypes.h" -#include "LETypes.h" -#include "loengine.h" +#include "layout/LETypes.h" +#include "layout/loengine.h" #include "gsupport.h" #include "rsurface.h" diff --git a/icu4c/source/samples/layout/rsurface.cpp b/icu4c/source/samples/layout/rsurface.cpp index b48357e0d974..f0bb87683483 100644 --- a/icu4c/source/samples/layout/rsurface.cpp +++ b/icu4c/source/samples/layout/rsurface.cpp @@ -7,11 +7,11 @@ * */ -#include "loengine.h" +#include "layout/loengine.h" #include "rsurface.h" -#include "LETypes.h" -#include "LEFontInstance.h" +#include "layout/LETypes.h" +#include "layout/LEFontInstance.h" #include "RenderingSurface.h" U_CDECL_BEGIN diff --git a/icu4c/source/samples/layout/rsurface.h b/icu4c/source/samples/layout/rsurface.h index 3292d79fc35e..f5a01611b846 100644 --- a/icu4c/source/samples/layout/rsurface.h +++ b/icu4c/source/samples/layout/rsurface.h @@ -10,7 +10,7 @@ #ifndef __RSURFACE_H #define __RSURFACE_H -#include "loengine.h" +#include "layout/loengine.h" typedef void rs_surface; diff --git a/icu4c/source/samples/layout/sfnt.h b/icu4c/source/samples/layout/sfnt.h index 1073744412e5..8de118605774 100644 --- a/icu4c/source/samples/layout/sfnt.h +++ b/icu4c/source/samples/layout/sfnt.h @@ -20,7 +20,7 @@ #ifndef __SFNT_H #define __SFNT_H -#include "LETypes.h" +#include "layout/LETypes.h" #ifndef ANY_NUMBER diff --git a/icu4c/source/test/letest/FontObject.cpp b/icu4c/source/test/letest/FontObject.cpp index 54dabf856dc9..2de2f12d2b99 100644 --- a/icu4c/source/test/letest/FontObject.cpp +++ b/icu4c/source/test/letest/FontObject.cpp @@ -9,9 +9,9 @@ #include -#include "LETypes.h" +#include "layout/LETypes.h" #include "FontObject.h" -#include "LESwaps.h" +#include "layout/LESwaps.h" FontObject::FontObject(char *fileName) : directory(nullptr), numTables(0), searchRange(0),entrySelector(0), diff --git a/icu4c/source/test/letest/FontObject.h b/icu4c/source/test/letest/FontObject.h index e8c9c9d0f984..4a1569cceb29 100644 --- a/icu4c/source/test/letest/FontObject.h +++ b/icu4c/source/test/letest/FontObject.h @@ -13,7 +13,7 @@ #include -#include "LETypes.h" +#include "layout/LETypes.h" #ifndef ANY_NUMBER diff --git a/icu4c/source/test/letest/SimpleFontInstance.cpp b/icu4c/source/test/letest/SimpleFontInstance.cpp index e707e5809d83..db7e29f51f88 100644 --- a/icu4c/source/test/letest/SimpleFontInstance.cpp +++ b/icu4c/source/test/letest/SimpleFontInstance.cpp @@ -20,7 +20,7 @@ #include "layout/LEFontInstance.h" #ifndef USING_ICULEHB -#include "CanonShaping.h" +#include "layout/CanonShaping.h" #endif #include "SimpleFontInstance.h" diff --git a/icu4c/source/test/letest/testdata.cpp b/icu4c/source/test/letest/testdata.cpp index af58dfefd656..ea8ff5f12dd1 100644 --- a/icu4c/source/test/letest/testdata.cpp +++ b/icu4c/source/test/letest/testdata.cpp @@ -16,8 +16,8 @@ * generated by: gendata.cpp */ -#include "LETypes.h" -#include "LEScripts.h" +#include "layout/LETypes.h" +#include "layout/LEScripts.h" #include "letest.h" const char *fontVersionString0 = "Version 0.99"; diff --git a/icu4c/source/test/perf/leperf/FontObject.cpp b/icu4c/source/test/perf/leperf/FontObject.cpp index 0b5d0a11c4b2..fa7d046cc1fd 100644 --- a/icu4c/source/test/perf/leperf/FontObject.cpp +++ b/icu4c/source/test/perf/leperf/FontObject.cpp @@ -13,9 +13,9 @@ #include -#include "LETypes.h" +#include "layout/LETypes.h" #include "FontObject.h" -#include "LESwaps.h" +#include "layout/LESwaps.h" FontObject::FontObject(char *fileName) : directory(nullptr), numTables(0), searchRange(0),entrySelector(0), diff --git a/icu4c/source/test/perf/leperf/FontObject.h b/icu4c/source/test/perf/leperf/FontObject.h index 95a438594ea9..b58f5c08dcf5 100644 --- a/icu4c/source/test/perf/leperf/FontObject.h +++ b/icu4c/source/test/perf/leperf/FontObject.h @@ -17,7 +17,7 @@ #include -#include "LETypes.h" +#include "layout/LETypes.h" #ifndef ANY_NUMBER diff --git a/icu4c/source/test/perf/leperf/Makefile.in b/icu4c/source/test/perf/leperf/Makefile.in index 0538e20ee997..27b0fb3153e5 100644 --- a/icu4c/source/test/perf/leperf/Makefile.in +++ b/icu4c/source/test/perf/leperf/Makefile.in @@ -24,7 +24,7 @@ CLEANFILES = *~ $(DEPS) ## Target information TARGET = leperf -CPPFLAGS += -I$(top_srcdir)/common -I$(top_srcdir)/layout/.. -I$(top_srcdir)/tools/toolutil -I$(top_srcdir)/tools/ctestfw -I$(top_srcdir)/io -I$(top_srcdir)/i18n +CPPFLAGS += -I$(top_srcdir)/common -I$(top_srcdir)/tools/toolutil -I$(top_srcdir)/tools/ctestfw -I$(top_srcdir)/io -I$(top_srcdir)/i18n LIBS = $(LIBCTESTFW) $(LIBICUIO) $(LIBICULE) $(LIBICUUC) $(LIBICUI18N) $(LIBICUTOOLUTIL) $(DEFAULT_LIBS) $(LIB_M) OBJECTS = $(TARGET).o diff --git a/icu4c/source/test/perf/leperf/cfonts.cpp b/icu4c/source/test/perf/leperf/cfonts.cpp index 62f7aeea9203..09328e893dbc 100644 --- a/icu4c/source/test/perf/leperf/cfonts.cpp +++ b/icu4c/source/test/perf/leperf/cfonts.cpp @@ -7,8 +7,8 @@ * */ -#include "LETypes.h" -#include "loengine.h" +#include "layout/LETypes.h" +#include "layout/loengine.h" #include "PortableFontInstance.h" #include "SimpleFontInstance.h" diff --git a/icu4c/source/test/perf/leperf/xmlreader.h b/icu4c/source/test/perf/leperf/xmlreader.h index 298d9b8197ac..978b7b402282 100644 --- a/icu4c/source/test/perf/leperf/xmlreader.h +++ b/icu4c/source/test/perf/leperf/xmlreader.h @@ -10,7 +10,7 @@ #ifndef __XMLREADER_H #define __XMLREADER_H -#include "LETypes.h" +#include "layout/LETypes.h" #include "letest.h" typedef void (*TestCaseCallback) (const char *testID,