1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove QUnicodeTools::DefaultOptionsCompat

Browse Source 
Used in only one place, declared in a private header with a comment
saying to remove it. All callers of the one function that had it as
default parameter value are passing a value for the parameter.

Task-number: QTBUG-85700
Change-Id: Ic72e4df730740a4023b0a43be6bf7acf33a3166b
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Edward Welbourne 2020-08-13 15:46:35 +02:00
parent 429985b53a
commit 1aa412987f
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/corelib/text/qunicodetools_p.h
View File

@ -91,7 +91,6 @@ enum CharAttributeOption {
LineBreaks = 0x08, LineBreaks = 0x08,
WhiteSpaces = 0x10, WhiteSpaces = 0x10,
HangulLineBreakTailoring = 0x20, HangulLineBreakTailoring = 0x20,
DefaultOptionsCompat = GraphemeBreaks | LineBreaks | WhiteSpaces, // ### remove
DontClearAttributes = 0x1000 DontClearAttributes = 0x1000
}; };
@ -100,7 +99,7 @@ Q_DECLARE_FLAGS(CharAttributeOptions, CharAttributeOption)
// attributes buffer has to have a length of string length + 1 // attributes buffer has to have a length of string length + 1
Q_CORE_EXPORT void initCharAttributes(const ushort *string, int length, Q_CORE_EXPORT void initCharAttributes(const ushort *string, int length,
const ScriptItem *items, int numItems, const ScriptItem *items, int numItems,
QCharAttributes *attributes, CharAttributeOptions options = DefaultOptionsCompat); QCharAttributes *attributes, CharAttributeOptions options);
Q_CORE_EXPORT void initScripts(const ushort *string, int length, ScriptItemArray *scripts); Q_CORE_EXPORT void initScripts(const ushort *string, int length, ScriptItemArray *scripts);

15
src/gui/text/qtextengine.cpp
View File

@ -1807,12 +1807,15 @@ const QCharAttributes *QTextEngine::attributes() const
scriptItems[i].script = QChar::Script(si.analysis.script); scriptItems[i].script = QChar::Script(si.analysis.script);
} }
QUnicodeTools::initCharAttributes(reinterpret_cast<const ushort *>(layoutData->string.constData()), QUnicodeTools::initCharAttributes(
layoutData->string.length(), reinterpret_cast<const ushort *>(layoutData->string.constData()),
scriptItems.data(), scriptItems.size(), layoutData->string.length(),
(QCharAttributes *)layoutData->memory, scriptItems.data(), scriptItems.size(),
QUnicodeTools::CharAttributeOptions(QUnicodeTools::DefaultOptionsCompat reinterpret_cast<QCharAttributes *>(layoutData->memory),
| QUnicodeTools::HangulLineBreakTailoring)); QUnicodeTools::CharAttributeOptions(QUnicodeTools::GraphemeBreaks
| QUnicodeTools::LineBreaks
| QUnicodeTools::WhiteSpaces
| QUnicodeTools::HangulLineBreakTailoring));
layoutData->haveCharAttributes = true; layoutData->haveCharAttributes = true;