From b32a997d9dd687f100198d4f30b05dfb412cca36 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Fri, 31 Mar 2006 02:20:23 +0000 Subject: Make #include syntax in sources and headers more consistent. We are using 2006-03-30 Behdad Esfahbod * pango/*.[ch]: Make #include syntax in sources and headers more consistent. We are using the "..." syntax for all Pango headers in source files, and <...> syntax in all header files, except for including private headers, that we use "...". --- pango/glyphstring.c | 6 +++--- pango/mapping.c | 2 +- pango/pango-context.c | 4 ++-- pango/pango-coverage.c | 2 +- pango/pango-item.c | 6 +++--- pango/pango-layout.c | 10 +++++----- pango/pango-markup.c | 6 +++--- pango/pango-ot-private.h | 2 +- pango/pangocairo-atsui.h | 2 +- pango/pangocairo-fc.h | 4 ++-- pango/pangocairo-win32.h | 4 ++-- pango/pangoft2-private.h | 4 ++-- pango/pangowin32-private.h | 4 ++-- pango/pangox-private.h | 5 ++--- pango/pangoxft-private.h | 4 ++-- pango/reorder-items.c | 2 +- 16 files changed, 33 insertions(+), 34 deletions(-) (limited to 'pango') diff --git a/pango/glyphstring.c b/pango/glyphstring.c index 541e9002..2f64b92e 100644 --- a/pango/glyphstring.c +++ b/pango/glyphstring.c @@ -21,9 +21,9 @@ #include #include -#include -#include -#include +#include "pango-glyph.h" +#include "pango-font.h" +#include "pango-impl-utils.h" /** * pango_glyph_string_new: diff --git a/pango/mapping.c b/pango/mapping.c index 8c2f9314..a90a55d0 100644 --- a/pango/mapping.c +++ b/pango/mapping.c @@ -30,7 +30,7 @@ * cursor positioning is allowed within clusters or not. */ -#include +#include "pango-glyph.h" /** * pango_glyph_string_index_to_x: diff --git a/pango/pango-context.c b/pango/pango-context.c index f2fd921c..937583d3 100644 --- a/pango/pango-context.c +++ b/pango/pango-context.c @@ -23,8 +23,8 @@ #include #include -#include "pango/pango-context.h" -#include "pango/pango-impl-utils.h" +#include "pango-context.h" +#include "pango-impl-utils.h" #include "pango-engine.h" #include "pango-engine-private.h" diff --git a/pango/pango-coverage.c b/pango/pango-coverage.c index c8f79d89..e29f018e 100644 --- a/pango/pango-coverage.c +++ b/pango/pango-coverage.c @@ -22,7 +22,7 @@ #include #include -#include +#include "pango-coverage.h" typedef struct _PangoBlockInfo PangoBlockInfo; diff --git a/pango/pango-item.c b/pango/pango-item.c index c6f1715a..37622e87 100644 --- a/pango/pango-item.c +++ b/pango/pango-item.c @@ -20,9 +20,9 @@ */ #include -#include -#include -#include +#include "pango-attributes.h" +#include "pango-item.h" +#include "pango-impl-utils.h" /** * pango_item_new: diff --git a/pango/pango-layout.c b/pango/pango-layout.c index a1592354..2f54b3ed 100644 --- a/pango/pango-layout.c +++ b/pango/pango-layout.c @@ -20,11 +20,11 @@ */ #include -#include /* For pango_shape() */ -#include -#include -#include -#include +#include "pango-glyph.h" /* For pango_shape() */ +#include "pango-break.h" +#include "pango-item.h" +#include "pango-engine.h" +#include "pango-impl-utils.h" #include #include "pango-layout-private.h" diff --git a/pango/pango-markup.c b/pango/pango-markup.c index b640c60f..48ce6ce6 100644 --- a/pango/pango-markup.c +++ b/pango/pango-markup.c @@ -24,9 +24,9 @@ #include #include -#include -#include -#include +#include "pango-attributes.h" +#include "pango-font.h" +#include "pango-impl-utils.h" /* FIXME */ #define _(x) x diff --git a/pango/pango-ot-private.h b/pango/pango-ot-private.h index 69954352..91bc3393 100644 --- a/pango/pango-ot-private.h +++ b/pango/pango-ot-private.h @@ -24,7 +24,7 @@ #include -#include "pango-ot.h" +#include #include "opentype/ftglue.h" #include "opentype/ftxopen.h" diff --git a/pango/pangocairo-atsui.h b/pango/pangocairo-atsui.h index 4b030cf8..4de615f6 100644 --- a/pango/pangocairo-atsui.h +++ b/pango/pangocairo-atsui.h @@ -23,7 +23,7 @@ #define __PANGOCAIRO_ATSUI_H__ #include "pangoatsui-private.h" -#include "pangocairo.h" +#include #include G_BEGIN_DECLS diff --git a/pango/pangocairo-fc.h b/pango/pangocairo-fc.h index 9c35aa17..5f9f8c04 100644 --- a/pango/pangocairo-fc.h +++ b/pango/pangocairo-fc.h @@ -22,8 +22,8 @@ #ifndef __PANGOCAIRO_FC_H__ #define __PANGOCAIRO_FC_H__ -#include "pangofc-fontmap.h" -#include "pangocairo.h" +#include +#include G_BEGIN_DECLS diff --git a/pango/pangocairo-win32.h b/pango/pangocairo-win32.h index 5efceb3f..4c0fce73 100644 --- a/pango/pangocairo-win32.h +++ b/pango/pangocairo-win32.h @@ -22,9 +22,9 @@ #ifndef __PANGOCAIRO_WIN32_H__ #define __PANGOCAIRO_WIN32_H__ -#include "pangowin32.h" +#include #include "pangowin32-private.h" -#include "pangocairo.h" +#include G_BEGIN_DECLS diff --git a/pango/pangoft2-private.h b/pango/pangoft2-private.h index 02c2cfc9..d1c11b90 100644 --- a/pango/pangoft2-private.h +++ b/pango/pangoft2-private.h @@ -23,8 +23,8 @@ #ifndef __PANGOFT2_PRIVATE_H__ #define __PANGOFT2_PRIVATE_H__ -#include "pangoft2.h" -#include "pango-renderer.h" +#include +#include #include /* Debugging... */ diff --git a/pango/pangowin32-private.h b/pango/pangowin32-private.h index 465bb09e..1557faed 100644 --- a/pango/pangowin32-private.h +++ b/pango/pangowin32-private.h @@ -52,8 +52,8 @@ #define PING(printlist) #endif -#include "pango-modules.h" -#include "pangowin32.h" +#include +#include typedef enum { diff --git a/pango/pangox-private.h b/pango/pangox-private.h index 0fb12976..e2cb12f1 100644 --- a/pango/pangox-private.h +++ b/pango/pangox-private.h @@ -22,9 +22,8 @@ #ifndef __PANGOX_PRIVATE_H__ #define __PANGOX_PRIVATE_H__ -#include "pango-modules.h" -#include "pangox.h" -#include "pangox-private.h" +#include +#include typedef struct _PangoXFace PangoXFace; typedef struct _PangoXFont PangoXFont; diff --git a/pango/pangoxft-private.h b/pango/pangoxft-private.h index 82e57da7..ee5598f1 100644 --- a/pango/pangoxft-private.h +++ b/pango/pangoxft-private.h @@ -22,8 +22,8 @@ #ifndef __PANGOXFT_PRIVATE_H__ #define __PANGOXFT_PRIVATE_H__ -#include "pangoxft.h" -#include "pango-renderer.h" +#include +#include G_BEGIN_DECLS diff --git a/pango/reorder-items.c b/pango/reorder-items.c index 1044fe55..41fb370d 100644 --- a/pango/reorder-items.c +++ b/pango/reorder-items.c @@ -20,7 +20,7 @@ */ #include -#include +#include "pango-glyph.h" /* * NB: The contents of the file implement the exact same algorithm -- cgit v1.2.1