diff options
Diffstat (limited to 'src/gui/text/qfontsubset_p.h')
-rw-r--r-- | src/gui/text/qfontsubset_p.h | 51 |
1 files changed, 7 insertions, 44 deletions
diff --git a/src/gui/text/qfontsubset_p.h b/src/gui/text/qfontsubset_p.h index 1a3b392601..1ec47f176d 100644 --- a/src/gui/text/qfontsubset_p.h +++ b/src/gui/text/qfontsubset_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtGui module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QFONTSUBSET_P_H #define QFONTSUBSET_P_H @@ -59,7 +23,7 @@ QT_BEGIN_NAMESPACE class QFontSubset { public: - explicit QFontSubset(QFontEngine *fe, int obj_id = 0) + explicit QFontSubset(QFontEngine *fe, uint obj_id = 0) : object_id(obj_id), noEmbed(false), fontEngine(fe), downloaded_glyphs(0), standard_font(false) { fontEngine->ref.ref(); @@ -77,19 +41,18 @@ public: QByteArray widthArray() const; QByteArray createToUnicodeMap() const; QList<int> getReverseMap() const; - QByteArray glyphName(unsigned int glyph, const QList<int> &reverseMap) const; static QByteArray glyphName(unsigned short unicode, bool symbol); - int addGlyph(int index); + qsizetype addGlyph(uint index); #endif - const int object_id; + const uint object_id; bool noEmbed; QFontEngine *fontEngine; - QList<int> glyph_indices; + QList<uint> glyph_indices; mutable int downloaded_glyphs; mutable bool standard_font; - int nGlyphs() const { return glyph_indices.size(); } + qsizetype nGlyphs() const { return glyph_indices.size(); } mutable QFixed emSquare; mutable QList<QFixed> widths; }; |