1 --- calligra-2.8.7/libs/db/tableviewdata.cpp.orig 2014-11-30 15:02:20.000000000 +0100
2 +++ calligra-2.8.7/libs/db/tableviewdata.cpp 2019-04-19 20:57:59.892689347 +0200
6 UErrorCode status = U_ZERO_ERROR;
7 - m_collator = Collator::createInstance(status);
8 + m_collator = icu::Collator::createInstance(status);
9 if (U_FAILURE(status)) {
10 kWarning() << "Could not create instance of collator: " << status;
13 kWarning() << "Could not set collator attribute: " << status;
16 - Collator* getCollator() {
17 + icu::Collator* getCollator() {
25 - Collator *m_collator;
26 + icu::Collator *m_collator;
29 K_GLOBAL_STATIC(CollatorInstance, _collator)
31 static bool cmpStringWithCollator(const QVariant& left, const QVariant& right) {
32 const QString &as = left.toString();
33 const QString &bs = right.toString();
34 - return (Collator::LESS == _collator->getCollator()->compare((const UChar *)as.constData(), as.size(),
35 + return (icu::Collator::LESS == _collator->getCollator()->compare((const UChar *)as.constData(), as.size(),
36 (const UChar *)bs.constData(), bs.size())) ? true : false;