ICU-22593 Add missing layout/ prefix for Layout Engine header files.

unicode-org · Dec 14, 2023 · 99f6be4 · 99f6be4
1 parent 391e3b8
commit 99f6be4
Show file tree

Hide file tree

Showing 15 changed files with 24 additions and 24 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -9,9 +9,9 @@
 
 #include <stdio.h>
 
-#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
@@ -13,7 +13,7 @@
 
 #include <stdio.h>
 
-#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
@@ -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
@@ -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
@@ -13,9 +13,9 @@
 
 #include <stdio.h>
 
-#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
@@ -17,7 +17,7 @@
 
 #include <stdio.h>
 
-#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
@@ -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
@@ -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
@@ -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,