[pango/harfbuzz-ng] [HB] Rename harfbuzz-buffer to hb-buffer

[Behdad Esfahbod <behdad src gnome org>]

commit c141180297254ef341e3e557c26b51eb7e964706
Author: Behdad Esfahbod <behdad behdad org>
Date:   Wed May 20 05:42:12 2009 -0400

    [HB] Rename harfbuzz-buffer to hb-buffer
---
 pango/opentype/Makefile.am                         |    5 +++--
 ...rfbuzz-buffer-private.h => hb-buffer-private.h} |    8 ++++----
 pango/opentype/{harfbuzz-buffer.c => hb-buffer.c}  |    4 +---
 pango/opentype/{harfbuzz-buffer.h => hb-buffer.h}  |    6 +++---
 pango/opentype/hb-ot-layout-gsubgpos-private.h     |    2 +-
 pango/opentype/hb-ot-layout-private.h              |    2 +-
 pango/opentype/hb-ot-layout.cc                     |    5 +++--
 pango/opentype/hb-ot-layout.h                      |    2 +-
 8 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/pango/opentype/Makefile.am b/pango/opentype/Makefile.am
index dc92c7a..3f662db 100644
--- a/pango/opentype/Makefile.am
+++ b/pango/opentype/Makefile.am
@@ -11,7 +11,8 @@ CXX = gcc $(GCCOPTS) -g -fno-rtti -fno-exceptions -Wabi -Wpadded -Wcast-align
 noinst_LTLIBRARIES = libharfbuzz-1.la
 
 HBSOURCES =  \
-	harfbuzz-buffer.c \
+	hb-buffer.c \
+	hb-buffer-private.h \
 	hb-private.h \
 	hb-ot-layout.cc \
 	hb-ot-layout-common-private.h \
@@ -25,7 +26,7 @@ HBSOURCES =  \
 
 HBHEADERS = \
 	hb-common.h \
-	harfbuzz-buffer.h \
+	hb-buffer.h \
 	hb-ot-layout.h \
 	$(NULL)
 
diff --git a/pango/opentype/harfbuzz-buffer-private.h b/pango/opentype/hb-buffer-private.h
similarity index 96%
rename from pango/opentype/harfbuzz-buffer-private.h
rename to pango/opentype/hb-buffer-private.h
index 752149f..dec3130 100644
--- a/pango/opentype/harfbuzz-buffer-private.h
+++ b/pango/opentype/hb-buffer-private.h
@@ -25,11 +25,11 @@
  * Red Hat Author(s): Owen Taylor, Behdad Esfahbod
  */
 
-#ifndef HARFBUZZ_BUFFER_PRIVATE_H
-#define HARFBUZZ_BUFFER_PRIVATE_H
+#ifndef HB_BUFFER_PRIVATE_H
+#define HB_BUFFER_PRIVATE_H
 
 #include "harfbuzz-impl.h"
-#include "harfbuzz-buffer.h"
+#include "hb-buffer.h"
 
 HB_BEGIN_HEADER
 
@@ -103,4 +103,4 @@ _hb_buffer_allocate_ligid( HB_Buffer buffer );
 
 HB_END_HEADER
 
-#endif /* HARFBUZZ_BUFFER_PRIVATE_H */
+#endif /* HB_BUFFER_PRIVATE_H */
diff --git a/pango/opentype/harfbuzz-buffer.c b/pango/opentype/hb-buffer.c
similarity index 98%
rename from pango/opentype/harfbuzz-buffer.c
rename to pango/opentype/hb-buffer.c
index 133cb80..e29e7f0 100644
--- a/pango/opentype/harfbuzz-buffer.c
+++ b/pango/opentype/hb-buffer.c
@@ -26,9 +26,7 @@
  */
 
 #include "harfbuzz-impl.h"
-#include "harfbuzz-buffer-private.h"
-#include "harfbuzz-gsub-private.h"
-#include "harfbuzz-gpos-private.h"
+#include "hb-buffer-private.h"
 
 /* Here is how the buffer works internally:
  *
diff --git a/pango/opentype/harfbuzz-buffer.h b/pango/opentype/hb-buffer.h
similarity index 97%
rename from pango/opentype/harfbuzz-buffer.h
rename to pango/opentype/hb-buffer.h
index 668753c..c7bf61f 100644
--- a/pango/opentype/harfbuzz-buffer.h
+++ b/pango/opentype/hb-buffer.h
@@ -25,8 +25,8 @@
  * Red Hat Author(s): Owen Taylor, Behdad Esfahbod
  */
 
-#ifndef HARFBUZZ_BUFFER_H
-#define HARFBUZZ_BUFFER_H
+#ifndef HB_BUFFER_H
+#define HB_BUFFER_H
 
 #include "hb-common.h"
 
@@ -91,4 +91,4 @@ hb_buffer_add_glyph (hb_buffer_t    *buffer,
 
 HB_END_DECLS();
 
-#endif /* HARFBUZZ_BUFFER_H */
+#endif /* HB_BUFFER_H */
diff --git a/pango/opentype/hb-ot-layout-gsubgpos-private.h b/pango/opentype/hb-ot-layout-gsubgpos-private.h
index 758841c..2f5a94b 100644
--- a/pango/opentype/hb-ot-layout-gsubgpos-private.h
+++ b/pango/opentype/hb-ot-layout-gsubgpos-private.h
@@ -28,7 +28,7 @@
 #define HB_OT_LAYOUT_GSUBGPOS_PRIVATE_H
 
 #include "hb-ot-layout-gdef-private.h"
-#include "harfbuzz-buffer-private.h" /* XXX */
+#include "hb-buffer-private.h" /* XXX */
 
 
 #define APPLY_ARG_DEF \
diff --git a/pango/opentype/hb-ot-layout-private.h b/pango/opentype/hb-ot-layout-private.h
index 80c36b4..a469119 100644
--- a/pango/opentype/hb-ot-layout-private.h
+++ b/pango/opentype/hb-ot-layout-private.h
@@ -31,7 +31,7 @@
 #include "hb-ot-layout.h"
 
 /* XXX */
-#include "harfbuzz-buffer.h"
+#include "hb-buffer.h"
 
 
 typedef unsigned int hb_ot_layout_class_t;
diff --git a/pango/opentype/hb-ot-layout.cc b/pango/opentype/hb-ot-layout.cc
index 5e3b483..a98a34d 100644
--- a/pango/opentype/hb-ot-layout.cc
+++ b/pango/opentype/hb-ot-layout.cc
@@ -28,6 +28,9 @@
 
 #define HB_OT_LAYOUT_CC
 
+/* XXX */
+#include "hb-buffer-private.h"
+
 #include "hb-ot-layout.h"
 #include "hb-ot-layout-private.h"
 
@@ -36,8 +39,6 @@
 #include "hb-ot-layout-gsub-private.h"
 #include "hb-ot-layout-gpos-private.h"
 
-/* XXX */
-#include "harfbuzz-buffer-private.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/pango/opentype/hb-ot-layout.h b/pango/opentype/hb-ot-layout.h
index 6aa05fc..c1dbdca 100644
--- a/pango/opentype/hb-ot-layout.h
+++ b/pango/opentype/hb-ot-layout.h
@@ -28,7 +28,7 @@
 #define HB_OT_LAYOUT_H
 
 #include "hb-common.h"
-#include "harfbuzz-buffer.h"
+#include "hb-buffer.h"
 
 HB_BEGIN_DECLS();