diff options
author | Konstantin Ritt <ritt.ks@gmail.com> | 2013-03-10 10:55:27 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-13 14:46:26 +0100 |
commit | 0194fa135b1d84a8c8d70ed8a0ff46eef0289fb7 (patch) | |
tree | 95c1767f3365c960ea19234dd70112b6eb5e1be5 /src/gui/text | |
parent | cfa663d62b147c4050359e036f17a6b1b6a8b4fe (diff) |
Hide Harfbuzz from the outer world
Don't export, don't generate private headers, don't mention HB in API.
Change-Id: I048ebd178bf4afaf9fda710a00933b95274cf910
Reviewed-by: Josh Faust <jfaust@suitabletech.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/gui/text')
-rw-r--r-- | src/gui/text/qharfbuzz_copy_p.h | 95 | ||||
-rw-r--r-- | src/gui/text/text.pri | 1 |
2 files changed, 0 insertions, 96 deletions
diff --git a/src/gui/text/qharfbuzz_copy_p.h b/src/gui/text/qharfbuzz_copy_p.h deleted file mode 100644 index 34acca3f9a..0000000000 --- a/src/gui/text/qharfbuzz_copy_p.h +++ /dev/null @@ -1,95 +0,0 @@ -/* - * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies) - * Copyright (C) 2007 Red Hat, Inc. - * - * This code is a modified version of some part of HarfBuzz, - * an OpenType Layout engine library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Red Hat Author(s): Behdad Esfahbod - */ - -#ifndef QHARFBUZZ_COPY_P_H -#define QHARFBUZZ_COPY_P_H - -/* - The purpose of this header file is to allow inclusion of the private - headers for font and text classes without having to pull in the full - harfbuzz library under QTDIR/src/3rdparty/harfbuzz/src -*/ -#if defined(QT_BUILD_GUI_LIB) || defined(QT_COMPILES_IN_HARFBUZZ) -#include <private/qharfbuzz_p.h> -#else - -extern "C" { - -#ifdef __xlC__ -typedef unsigned hb_bitfield; -#else -typedef QT_PREPEND_NAMESPACE(quint8) hb_bitfield; -#endif - -typedef enum { - /* no error */ - HB_Err_Ok = 0x0000, - HB_Err_Not_Covered = 0xFFFF, - - /* _hb_err() is called whenever returning the following errors, - * and in a couple places for HB_Err_Not_Covered too. */ - - /* programmer error */ - HB_Err_Invalid_Argument = 0x1A66, - - /* font error */ - HB_Err_Invalid_SubTable_Format = 0x157F, - HB_Err_Invalid_SubTable = 0x1570, - HB_Err_Read_Error = 0x6EAD, - - /* system error */ - HB_Err_Out_Of_Memory = 0xDEAD -} HB_Error; - -typedef QT_PREPEND_NAMESPACE(quint32) HB_Glyph; -typedef void * HB_Font; -typedef void * HB_Face; -typedef void * HB_FontRec; -typedef QT_PREPEND_NAMESPACE(quint32) hb_uint32; -typedef QT_PREPEND_NAMESPACE(qint32) HB_Fixed; - -typedef struct { - HB_Fixed x; - HB_Fixed y; -} HB_FixedPoint; - -// The GlyphAttrbutes class is used inline so it needs to be complete. -typedef struct { - hb_bitfield justification :4; /* Justification class */ - hb_bitfield clusterStart :1; /* First glyph of representation of cluster */ - hb_bitfield mark :1; /* needs to be positioned around base char */ - hb_bitfield zeroWidth :1; /* ZWJ, ZWNJ etc, with no width */ - hb_bitfield dontPrint :1; - hb_bitfield combiningClass :8; -} HB_GlyphAttributes; - -} - -#endif // ifdef QT_BUILD_GUI_LIB - -#endif // QHARFBUZZ_COPY_P_H diff --git a/src/gui/text/text.pri b/src/gui/text/text.pri index 436b7c7aec..e9ea2a3f83 100644 --- a/src/gui/text/text.pri +++ b/src/gui/text/text.pri @@ -42,7 +42,6 @@ HEADERS += \ text/qrawfont_p.h \ text/qglyphrun.h \ text/qglyphrun_p.h \ - text/qharfbuzz_copy_p.h \ text/qdistancefield_p.h SOURCES += \ |