inline QUnicodeTables method overloads

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2019-11-20 16:49:33 +00:00
parent 5e78f8e006
commit 5c44ab9ef2
2 changed files with 9 additions and 24 deletions

View file

@ -1842,11 +1842,6 @@ Q_CORE_EXPORT int QT_FASTCALL QUnicodeTables::digitValue(uint ucs4)
return -1;
}
Q_CORE_EXPORT int QT_FASTCALL QUnicodeTables::digitValue(ushort digit)
{
return QUnicodeTables::digitValue(uint(digit));
}
Q_CORE_EXPORT QChar::Joining QT_FASTCALL QUnicodeTables::joining(uint ucs4)
{
switch (ucs4) {
@ -2622,11 +2617,6 @@ Q_CORE_EXPORT QChar::Joining QT_FASTCALL QUnicodeTables::joining(uint ucs4)
return QChar::OtherJoining;
}
Q_CORE_EXPORT QChar::Joining QT_FASTCALL QUnicodeTables::joining(ushort ucs2)
{
return QUnicodeTables::joining(uint(ucs2));
}
Q_CORE_EXPORT uint QT_FASTCALL QUnicodeTables::mirroredChar(uint ucs4)
{
switch (ucs4) {
@ -3474,11 +3464,6 @@ Q_CORE_EXPORT uint QT_FASTCALL QUnicodeTables::mirroredChar(uint ucs4)
return ucs4;
}
Q_CORE_EXPORT ushort QT_FASTCALL QUnicodeTables::mirroredChar(ushort ucs2)
{
return QUnicodeTables::mirroredChar(uint(ucs2));
}
Q_CORE_EXPORT QChar::UnicodeVersion QT_FASTCALL QUnicodeTables::unicodeVersion(uint ucs4)
{
switch (ucs4) {
@ -6218,11 +6203,6 @@ Q_CORE_EXPORT QChar::UnicodeVersion QT_FASTCALL QUnicodeTables::unicodeVersion(u
return QChar::Unicode_Unassigned;
}
Q_CORE_EXPORT QChar::UnicodeVersion QT_FASTCALL QUnicodeTables::unicodeVersion(ushort ucs2)
{
return QUnicodeTables::unicodeVersion(uint(ucs2));
}
Q_CORE_EXPORT QUnicodeTables::CombiningClass QT_FASTCALL QUnicodeTables::combiningClass(uint ucs4)
{
switch (ucs4) {

View file

@ -55,13 +55,18 @@ namespace QUnicodeTables {
// required by QChar
Q_CORE_EXPORT int QT_FASTCALL digitValue(uint ucs4);
Q_CORE_EXPORT int QT_FASTCALL digitValue(ushort ucs2);
inline int QT_FASTCALL digitValue(ushort ucs2)
{ return QUnicodeTables::digitValue(uint(ucs2)); }
Q_CORE_EXPORT QChar::Joining QT_FASTCALL joining(uint ucs4);
Q_CORE_EXPORT QChar::Joining QT_FASTCALL joining(ushort ucs2);
inline QChar::Joining QT_FASTCALL joining(ushort ucs2)
{ return QUnicodeTables::joining(uint(ucs2)); }
Q_CORE_EXPORT uint QT_FASTCALL mirroredChar(uint ucs4);
Q_CORE_EXPORT ushort QT_FASTCALL mirroredChar(ushort ucs2);
inline ushort QT_FASTCALL mirroredChar(ushort ucs2)
{ return QUnicodeTables::mirroredChar(uint(ucs2)); }
Q_CORE_EXPORT QChar::UnicodeVersion QT_FASTCALL unicodeVersion(uint ucs4);
Q_CORE_EXPORT QChar::UnicodeVersion QT_FASTCALL unicodeVersion(ushort ucs2);
inline QChar::UnicodeVersion QT_FASTCALL unicodeVersion(ushort ucs2)
{ return QUnicodeTables::unicodeVersion(uint(ucs2)); }
// required by Harfbuzz
enum CombiningClass {