Move ScriptSentinel enum from header to .cpp
Change-Id: Ic74e8e2471e92aa2014735f6ab0bb4f3b88de206 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
This commit is contained in:
parent
7c1e0fef8e
commit
2b15c1b30f
@ -9559,6 +9559,8 @@ static const unsigned char uc_scripts[] = {
|
|||||||
Common, Common, Common, Common, Common, Common, Common, Common
|
Common, Common, Common, Common, Common, Common, Common, Common
|
||||||
};
|
};
|
||||||
|
|
||||||
|
enum { ScriptSentinel = 32 };
|
||||||
|
|
||||||
Q_CORE_EXPORT int QT_FASTCALL script(uint ucs4)
|
Q_CORE_EXPORT int QT_FASTCALL script(uint ucs4)
|
||||||
{
|
{
|
||||||
if (ucs4 > 0xffff)
|
if (ucs4 > 0xffff)
|
||||||
|
@ -157,7 +157,6 @@ namespace QUnicodeTables {
|
|||||||
Phoenician = Common,
|
Phoenician = Common,
|
||||||
PhagsPa = Common
|
PhagsPa = Common
|
||||||
};
|
};
|
||||||
enum { ScriptSentinel = 32 };
|
|
||||||
|
|
||||||
|
|
||||||
enum GraphemeBreak {
|
enum GraphemeBreak {
|
||||||
|
@ -1913,12 +1913,10 @@ QByteArray createScriptEnumDeclaration()
|
|||||||
declaration += " = Common";
|
declaration += " = Common";
|
||||||
}
|
}
|
||||||
|
|
||||||
declaration += "\n };\n";
|
declaration += "\n };\n\n";
|
||||||
|
|
||||||
scriptSentinel = ((uniqueScripts + 16) / 32) * 32; // a multiple of 32
|
scriptSentinel = ((uniqueScripts + 16) / 32) * 32; // a multiple of 32
|
||||||
declaration += " enum { ScriptSentinel = ";
|
|
||||||
declaration += QByteArray::number(scriptSentinel);
|
|
||||||
declaration += " };\n\n";
|
|
||||||
return declaration;
|
return declaration;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2017,6 +2015,8 @@ QByteArray createScriptTableDeclaration()
|
|||||||
}
|
}
|
||||||
declaration += "\n};\n\n";
|
declaration += "\n};\n\n";
|
||||||
|
|
||||||
|
declaration += "enum { ScriptSentinel = " + QByteArray::number(scriptSentinel) + " };\n\n";
|
||||||
|
|
||||||
declaration +=
|
declaration +=
|
||||||
"Q_CORE_EXPORT int QT_FASTCALL script(uint ucs4)\n"
|
"Q_CORE_EXPORT int QT_FASTCALL script(uint ucs4)\n"
|
||||||
"{\n"
|
"{\n"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user