AuroraMiddleware/harfbuzz
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename all private sources and headers to C++ files

Browse Source 
So we can liberally use the simple features of C++ that parts of the
codebase is already using.
This commit is contained in:
Behdad Esfahbod 2011-04-20 18:50:27 -04:00
parent f19f4f9b09
commit c57d454acc
24 changed files with 63 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Makefile.am
View File

@ -12,17 +12,17 @@ HBCFLAGS =
HBLIBS =
HBSOURCES = \
hb-blob.cc \
hb-blob-private.h \
hb-blob-private.hh \
hb-buffer.cc \
hb-buffer-private.hh \
hb-common.c \
hb-common.cc \
hb-font.cc \
hb-font-private.h \
hb-object-private.h \
hb-font-private.hh \
hb-object-private.hh \
hb-open-file-private.hh \
hb-open-type-private.hh \
hb-ot-head-private.hh \
hb-private.h \
hb-private.hh \
hb-shape.cc \
hb-unicode.cc \
hb-unicode-private.hh \
@ -49,10 +49,10 @@ HBSOURCES += \
hb-ot-map-private.hh \
hb-ot-shape.cc \
hb-ot-shape-complex-arabic.cc \
hb-ot-shape-complex-arabic-table.h \
hb-ot-shape-complex-arabic-table.hh \
hb-ot-shape-complex-private.hh \
hb-ot-shape-private.hh \
hb-ot-tag.c \
hb-ot-tag.cc \
$(NULL)
HBHEADERS += \
hb-ot.h \
@ -87,7 +87,7 @@ if HAVE_FREETYPE
HBCFLAGS += $(FREETYPE_CFLAGS)
HBLIBS += $(FREETYPE_LIBS)
HBSOURCES += \
hb-ft.c \
hb-ft.cc \
$(NULL)
HBHEADERS += \
hb-ft.h \
@ -142,5 +142,6 @@ else
dist_check_SCRIPTS += check-libstdc++.sh
endif
TESTS = $(dist_check_SCRIPTS)
-include $(top_srcdir)/git.mk

8
src/hb-blob-private.h → src/hb-blob-private.hh
View File

@ -24,10 +24,10 @@
* Red Hat Author(s): Behdad Esfahbod
*/
#ifndef HB_BLOB_PRIVATE_H
#define HB_BLOB_PRIVATE_H
#ifndef HB_BLOB_PRIVATE_HH
#define HB_BLOB_PRIVATE_HH
#include "hb-private.h"
#include "hb-private.hh"
#include "hb-blob.h"
@ -56,4 +56,4 @@ extern HB_INTERNAL hb_blob_t _hb_blob_nil;
HB_END_DECLS
#endif /* HB_BLOB_PRIVATE_H */
#endif /* HB_BLOB_PRIVATE_HH */

4
src/hb-blob.cc
View File

@ -24,9 +24,9 @@
* Red Hat Author(s): Behdad Esfahbod
*/
#include "hb-private.h"
#include "hb-private.hh"
#include "hb-blob-private.h"
#include "hb-blob-private.hh"
#ifdef HAVE_SYS_MMAN_H
#ifdef HAVE_UNISTD_H

2
src/hb-buffer-private.hh
View File

@ -28,7 +28,7 @@
#ifndef HB_BUFFER_PRIVATE_HH
#define HB_BUFFER_PRIVATE_HH
#include "hb-private.h"
#include "hb-private.hh"
#include "hb-buffer.h"
#include "hb-unicode-private.hh"

8
src/hb-common.c → src/hb-common.cc
View File

@ -24,7 +24,7 @@
* Red Hat Author(s): Behdad Esfahbod
*/
#include "hb-private.h"
#include "hb-private.hh"
HB_BEGIN_DECLS
@ -70,8 +70,8 @@ static hb_bool_t
lang_equal (const void *v1,
const void *v2)
{
const unsigned char *p1 = v1;
const unsigned char *p2 = v2;
const unsigned char *p1 = (const unsigned char *) v1;
const unsigned char *p2 = (const unsigned char *) v2;
while (canon_map[*p1] && canon_map[*p1] == canon_map[*p2])
{
@ -118,7 +118,7 @@ hb_language_from_string (const char *str)
if (unlikely (num_langs == num_alloced)) {
unsigned int new_alloced = 2 * (8 + num_alloced);
hb_language_t *new_langs = realloc (langs, new_alloced * sizeof (langs[0]));
hb_language_t *new_langs = (hb_language_t *) realloc (langs, new_alloced * sizeof (langs[0]));
if (!new_langs)
return NULL;
num_alloced = new_alloced;

8
src/hb-font-private.h → src/hb-font-private.hh
View File

@ -24,10 +24,10 @@
* Red Hat Author(s): Behdad Esfahbod
*/
#ifndef HB_FONT_PRIVATE_H
#define HB_FONT_PRIVATE_H
#ifndef HB_FONT_PRIVATE_HH
#define HB_FONT_PRIVATE_HH
#include "hb-private.h"
#include "hb-private.hh"
#include "hb-font.h"
@ -94,4 +94,4 @@ struct _hb_font_t {
HB_END_DECLS
#endif /* HB_FONT_PRIVATE_H */
#endif /* HB_FONT_PRIVATE_HH */

6
src/hb-font.cc
View File

@ -24,10 +24,10 @@
* Red Hat Author(s): Behdad Esfahbod
*/
#include "hb-private.h"
#include "hb-private.hh"
#include "hb-font-private.h"
#include "hb-blob-private.h"
#include "hb-font-private.hh"
#include "hb-blob-private.hh"
#include "hb-open-file-private.hh"
#include "hb-ot-layout-private.hh"

4
src/hb-ft.c → src/hb-ft.cc
View File

@ -25,11 +25,11 @@
* Red Hat Author(s): Behdad Esfahbod
*/
#include "hb-private.h"
#include "hb-private.hh"
#include "hb-ft.h"
#include "hb-font-private.h"
#include "hb-font-private.hh"
#include FT_TRUETYPE_TABLES_H

2
src/hb-glib.cc
View File

@ -24,7 +24,7 @@
* Red Hat Author(s): Behdad Esfahbod
*/
#include "hb-private.h"
#include "hb-private.hh"
#include "hb-glib.h"

2
src/hb-icu.cc
View File

@ -25,7 +25,7 @@
* Red Hat Author(s): Behdad Esfahbod
*/
#include "hb-private.h"
#include "hb-private.hh"
#include "hb-icu.h"

10
src/hb-object-private.h → src/hb-object-private.hh
View File

@ -27,10 +27,10 @@
* Red Hat Author(s): Behdad Esfahbod
*/
#ifndef HB_OBJECT_PRIVATE_H
#define HB_OBJECT_PRIVATE_H
#ifndef HB_OBJECT_PRIVATE_HH
#define HB_OBJECT_PRIVATE_HH
#include "hb-private.h"
#include "hb-private.hh"
HB_BEGIN_DECLS
@ -53,8 +53,6 @@ typedef struct {
#define HB_REFERENCE_COUNT_IS_INVALID(RC) (HB_REFERENCE_COUNT_GET_VALUE (RC) == HB_REFERENCE_COUNT_INVALID_VALUE)
#define HB_REFERENCE_COUNT_HAS_REFERENCE(RC) (HB_REFERENCE_COUNT_GET_VALUE (RC) > 0)
/* Debug */
@ -131,4 +129,4 @@ _hb_trace_object (const void *obj,
HB_END_DECLS
#endif /* HB_OBJECT_PRIVATE_H */
#endif /* HB_OBJECT_PRIVATE_HH */

2
src/hb-open-type-private.hh
View File

@ -27,7 +27,7 @@
#ifndef HB_OPEN_TYPE_PRIVATE_HH
#define HB_OPEN_TYPE_PRIVATE_HH
#include "hb-private.h"
#include "hb-private.hh"
#include "hb-blob.h"

2
src/hb-ot-layout-gdef-private.hh
View File

@ -31,7 +31,7 @@
#include "hb-ot-layout-common-private.hh"
#include "hb-font-private.h"
#include "hb-font-private.hh"
HB_BEGIN_DECLS

4
src/hb-ot-layout-private.hh
View File

@ -27,12 +27,12 @@
#ifndef HB_OT_LAYOUT_PRIVATE_HH
#define HB_OT_LAYOUT_PRIVATE_HH
#include "hb-private.h"
#include "hb-private.hh"
#include "hb-ot-layout.h"
#include "hb-ot-head-private.hh"
#include "hb-font-private.h"
#include "hb-font-private.hh"
#include "hb-buffer-private.hh"
HB_BEGIN_DECLS

8
src/hb-ot-shape-complex-arabic-table.h → src/hb-ot-shape-complex-arabic-table.hh
View File

@ -24,10 +24,10 @@
* Google Author(s): Behdad Esfahbod
*/
#ifndef HB_OT_SHAPE_COMPLEX_ARABIC_TABLE_H
#define HB_OT_SHAPE_COMPLEX_ARABIC_TABLE_H
#ifndef HB_OT_SHAPE_COMPLEX_ARABIC_TABLE_HH
#define HB_OT_SHAPE_COMPLEX_ARABIC_TABLE_HH
#include "hb-private.h"
#include "hb-private.hh"
HB_BEGIN_DECLS
@ -671,4 +671,4 @@ static const uint8_t joining_table[] =
HB_END_DECLS
#endif /* HB_OT_SHAPE_COMPLEX_ARABIC_TABLE_H */
#endif /* HB_OT_SHAPE_COMPLEX_ARABIC_TABLE_HH */

2
src/hb-ot-shape-complex-arabic.cc
View File

@ -55,7 +55,7 @@ enum {
* Joining types:
*/
#include "hb-ot-shape-complex-arabic-table.h"
#include "hb-ot-shape-complex-arabic-table.hh"
static unsigned int get_joining_type (hb_codepoint_t u, hb_unicode_general_category_t gen_cat)
{

2
src/hb-ot-shape-complex-private.hh
View File

@ -27,7 +27,7 @@
#ifndef HB_OT_SHAPE_COMPLEX_PRIVATE_HH
#define HB_OT_SHAPE_COMPLEX_PRIVATE_HH
#include "hb-private.h"
#include "hb-private.hh"
#include "hb-ot-shape-private.hh"

2
src/hb-ot-shape-private.hh
View File

@ -27,7 +27,7 @@
#ifndef HB_OT_SHAPE_PRIVATE_HH
#define HB_OT_SHAPE_PRIVATE_HH
#include "hb-private.h"
#include "hb-private.hh"
#include "hb-ot-shape.h"

8
src/hb-ot-tag.c → src/hb-ot-tag.cc
View File

@ -24,7 +24,7 @@
* Red Hat Author(s): Behdad Esfahbod
*/
#include "hb-private.h"
#include "hb-private.hh"
#include "hb-ot.h"
#include <string.h>
@ -619,9 +619,9 @@ hb_ot_tag_from_language (hb_language_t language)
}
/* find a language matching in the first component */
lang_tag = bsearch (lang_str, ot_languages,
ARRAY_LENGTH (ot_languages), sizeof (LangTag),
(hb_compare_func_t) lang_compare_first_component);
lang_tag = (LangTag *) bsearch (lang_str, ot_languages,
ARRAY_LENGTH (ot_languages), sizeof (LangTag),
(hb_compare_func_t) lang_compare_first_component);
/* we now need to find the best language matching */
if (lang_tag)

8
src/hb-private.h → src/hb-private.hh
View File

@ -24,8 +24,8 @@
* Red Hat Author(s): Behdad Esfahbod
*/
#ifndef HB_PRIVATE_H
#define HB_PRIVATE_H
#ifndef HB_PRIVATE_HH
#define HB_PRIVATE_HH
#if HAVE_CONFIG_H
#include "config.h"
@ -293,9 +293,9 @@ _hb_trace (const char *what,
}
#include "hb-object-private.h"
#include "hb-object-private.hh"
HB_END_DECLS
#endif /* HB_PRIVATE_H */
#endif /* HB_PRIVATE_HH */

2
src/hb-shape.cc
View File

@ -24,7 +24,7 @@
* Red Hat Author(s): Behdad Esfahbod
*/
#include "hb-private.h"
#include "hb-private.hh"
#include "hb-shape.h"

2
src/hb-unicode-private.hh
View File

@ -31,7 +31,7 @@
#ifndef HB_UNICODE_PRIVATE_HH
#define HB_UNICODE_PRIVATE_HH
#include "hb-private.h"
#include "hb-private.hh"
#include "hb-unicode.h"

2
src/hb-unicode.cc
View File

@ -28,7 +28,7 @@
* Google Author(s): Behdad Esfahbod
*/
#include "hb-private.h"
#include "hb-private.hh"
#include "hb-unicode-private.hh"

6
src/hb-view.c
View File

@ -42,6 +42,9 @@
#include <cairo-ft.h>
#include <hb-ft.h>
HB_BEGIN_DECLS
/* Controlled by cmd-line options */
static int margin_t = 10;
static int margin_b = 10;
@ -533,3 +536,6 @@ main (int argc, char **argv)
return 0;
}
HB_END_DECLS