diff options
Diffstat (limited to 'src/corelib/tools/qunicodetables_p.h')
| -rw-r--r-- | src/corelib/tools/qunicodetables_p.h | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/src/corelib/tools/qunicodetables_p.h b/src/corelib/tools/qunicodetables_p.h index 64e1ad12b5..43c1f4e197 100644 --- a/src/corelib/tools/qunicodetables_p.h +++ b/src/corelib/tools/qunicodetables_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the QtCore module of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,15 +23,15 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** $QT_END_LICENSE$ ** ****************************************************************************/ -/* This file is autogenerated from the Unicode 6.2 database. Do not edit */ +/* This file is autogenerated from the Unicode 7.0 database. Do not edit */ // // W A R N I N G @@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE -#define UNICODE_DATA_VERSION QChar::Unicode_6_2 +#define UNICODE_DATA_VERSION QChar::Unicode_7_0 namespace QUnicodeTables { @@ -60,27 +60,27 @@ struct Properties { ushort direction : 8; /* 5 used */ ushort combiningClass : 8; ushort joining : 3; - signed short digitValue : 5; /* 5 used */ + signed short digitValue : 5; signed short mirrorDiff : 16; - signed short lowerCaseDiff : 16; - signed short upperCaseDiff : 16; - signed short titleCaseDiff : 16; - signed short caseFoldDiff : 16; ushort lowerCaseSpecial : 1; + signed short lowerCaseDiff : 15; ushort upperCaseSpecial : 1; + signed short upperCaseDiff : 15; ushort titleCaseSpecial : 1; + signed short titleCaseDiff : 15; ushort caseFoldSpecial : 1; - ushort unicodeVersion : 4; + signed short caseFoldDiff : 15; + ushort unicodeVersion : 8; /* 5 used */ ushort nfQuickCheck : 8; ushort graphemeBreakClass : 4; /* 4 used */ ushort wordBreakClass : 4; /* 4 used */ ushort sentenceBreakClass : 8; /* 4 used */ ushort lineBreakClass : 8; /* 6 used */ - ushort script : 8; /* 7 used */ + ushort script : 8; }; -Q_CORE_EXPORT const Properties * QT_FASTCALL properties(uint ucs4); -Q_CORE_EXPORT const Properties * QT_FASTCALL properties(ushort ucs2); +Q_CORE_EXPORT const Properties * QT_FASTCALL properties(uint ucs4) Q_DECL_NOTHROW; +Q_CORE_EXPORT const Properties * QT_FASTCALL properties(ushort ucs2) Q_DECL_NOTHROW; enum GraphemeBreakClass { GraphemeBreak_Other, @@ -147,20 +147,20 @@ enum LineBreakClass { LineBreak_BK }; -Q_CORE_EXPORT GraphemeBreakClass QT_FASTCALL graphemeBreakClass(uint ucs4); -inline GraphemeBreakClass graphemeBreakClass(QChar ch) +Q_CORE_EXPORT GraphemeBreakClass QT_FASTCALL graphemeBreakClass(uint ucs4) Q_DECL_NOTHROW; +inline GraphemeBreakClass graphemeBreakClass(QChar ch) Q_DECL_NOTHROW { return graphemeBreakClass(ch.unicode()); } -Q_CORE_EXPORT WordBreakClass QT_FASTCALL wordBreakClass(uint ucs4); -inline WordBreakClass wordBreakClass(QChar ch) +Q_CORE_EXPORT WordBreakClass QT_FASTCALL wordBreakClass(uint ucs4) Q_DECL_NOTHROW; +inline WordBreakClass wordBreakClass(QChar ch) Q_DECL_NOTHROW { return wordBreakClass(ch.unicode()); } -Q_CORE_EXPORT SentenceBreakClass QT_FASTCALL sentenceBreakClass(uint ucs4); -inline SentenceBreakClass sentenceBreakClass(QChar ch) +Q_CORE_EXPORT SentenceBreakClass QT_FASTCALL sentenceBreakClass(uint ucs4) Q_DECL_NOTHROW; +inline SentenceBreakClass sentenceBreakClass(QChar ch) Q_DECL_NOTHROW { return sentenceBreakClass(ch.unicode()); } -Q_CORE_EXPORT LineBreakClass QT_FASTCALL lineBreakClass(uint ucs4); -inline LineBreakClass lineBreakClass(QChar ch) +Q_CORE_EXPORT LineBreakClass QT_FASTCALL lineBreakClass(uint ucs4) Q_DECL_NOTHROW; +inline LineBreakClass lineBreakClass(QChar ch) Q_DECL_NOTHROW { return lineBreakClass(ch.unicode()); } } // namespace QUnicodeTables |