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

Tidy up macOS collation and add some assertions

Browse Source 
Change-Id: I7af21ce38f2f23498d7c8a7e027bfffb149a43e3
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
This commit is contained in:
Edward Welbourne 2021-10-05 16:39:42 +02:00
parent 5d228beb52
commit d83dbc3db2
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/corelib/text/qcollator_macx.cpp
View File

@ -126,17 +126,19 @@ QCollatorSortKey QCollator::sortKey(const QString &string) const
return QCollatorSortKey(nullptr); return QCollatorSortKey(nullptr);
} }
auto text = reinterpret_cast<const UniChar *>(string.constData());
// Documentation recommends having it 5 times as big as the input // Documentation recommends having it 5 times as big as the input
QList<UCCollationValue> ret(string.size() * 5); QList<UCCollationValue> ret(string.size() * 5);
ItemCount actualSize; ItemCount actualSize;
int status = UCGetCollationKey(d->collator, int status = UCGetCollationKey(d->collator, text, string.count(),
reinterpret_cast<const UniChar *>(string.constData()), ret.size(), &actualSize, ret.data());
string.count(), ret.size(), &actualSize, ret.data());
ret.resize(actualSize + 1); ret.resize(actualSize + 1);
if (status == kUCOutputBufferTooSmall) { if (status == kUCOutputBufferTooSmall) {
UCGetCollationKey(d->collator, reinterpret_cast<const UniChar *>(string.constData()), status = UCGetCollationKey(d->collator, text, string.count(),
string.count(), ret.size(), &actualSize, ret.data()); ret.size(), &actualSize, ret.data());
Q_ASSERT(status != kUCOutputBufferTooSmall);
Q_ASSERT(ret.size() == actualSize + 1);
} }
ret[actualSize] = 0; ret[actualSize] = 0;
return QCollatorSortKey(new QCollatorSortKeyPrivate(std::move(ret))); return QCollatorSortKey(new QCollatorSortKeyPrivate(std::move(ret)));
@ -150,7 +152,7 @@ int QCollatorSortKey::compare(const QCollatorSortKey &key) const
SInt32 order; SInt32 order;
UCCompareCollationKeys(d->m_key.data(), d->m_key.size(), UCCompareCollationKeys(d->m_key.data(), d->m_key.size(),
key.d->m_key.data(), key.d->m_key.size(), key.d->m_key.data(), key.d->m_key.size(),
0, &order); nullptr, &order);
return order; return order;
} }