Merge branch 'jb45113' into 'master'

Make mlocale to build against icu 63.1 See merge request mer-core/libmlocale!4
sailfishos · Mar 13, 2019 · 5c837bd · 5c837bd
2 parents 8ba84e5 + 8484388
commit 5c837bd
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 17 deletions.
diff --git a/rpm/libmlocale-qt5.spec b/rpm/libmlocale-qt5.spec
@@ -51,7 +51,7 @@ Requires:   %{name} = %{version}-%{release}
 %build
 export QT_SELECT=5
 
-%configure --disable-static
+%configure --disable-static -icu
 make %{?_smp_mflags}
 
 %install

diff --git a/src/icu-extradata/icu-extradata.pro b/src/icu-extradata/icu-extradata.pro
@@ -134,8 +134,7 @@ greaterThan(ICUVERSION, 4.4) {
                  data/lang/pt_PT.txt \
                  data/lang/zh.txt \
                  data/lang/zh_Hant.txt
-    COLLTXT    = data/coll/zh.txt \
-                 data/coll/be.txt \
+    COLLTXT    = data/coll/be.txt \
                  data/coll/bg.txt \
                  data/coll/kk.txt \
                  data/coll/mk.txt \

diff --git a/src/mcalendar.cpp b/src/mcalendar.cpp
@@ -169,7 +169,7 @@ MCalendar::MCalendar(MLocale::CalendarType calendarType,
 
     if (timezone.isEmpty() == false) {
         // with explicit time zone
-        UnicodeString tzString;
+        icu::UnicodeString tzString;
         tzString = MIcuConversions::qStringToUnicodeString(timezone);
         icu::TimeZone *tz = icu::TimeZone::createTimeZone(tzString);
         d->_calendar = icu::Calendar::createInstance(tz, calLocale, status);
@@ -196,7 +196,7 @@ MCalendar::MCalendar(const MLocale &mLocale, const QString &timezone)
     = mLocale.d_ptr->getCategoryLocale(MLocale::MLcTime);
 
     if (timezone.isEmpty() == false) {
-        UnicodeString tzString;
+        icu::UnicodeString tzString;
         tzString = MIcuConversions::qStringToUnicodeString(timezone);
         icu::TimeZone *tz = icu::TimeZone::createTimeZone(tzString);
         d->_calendar = icu::Calendar::createInstance(tz, calLocale, status);
@@ -861,7 +861,7 @@ QStringList MCalendar::supportedTimeZones()
 
     QStringList result;
     UErrorCode status = U_ZERO_ERROR;
-    const UnicodeString *next = strEnum->snext(status);
+    const icu::UnicodeString *next = strEnum->snext(status);
 
     while (next != 0) {
         result << MIcuConversions::unicodeStringToQString(*next);
@@ -880,7 +880,7 @@ QStringList MCalendar::supportedTimeZones(const QString &country)
 
     QStringList result;
     UErrorCode status = U_ZERO_ERROR;
-    const UnicodeString *next = strEnum->snext(status);
+    const icu::UnicodeString *next = strEnum->snext(status);
 
     while (next != 0) {
         result << MIcuConversions::unicodeStringToQString(*next);

diff --git a/src/mcity.cpp b/src/mcity.cpp
@@ -22,6 +22,8 @@
 #ifdef HAVE_ICU
 #include <unicode/timezone.h>
 #include "micuconversions.h"
+
+using namespace icu;
 #endif
 
 namespace ML10N {

diff --git a/src/mcollator.cpp b/src/mcollator.cpp
@@ -182,7 +182,7 @@ bool MCollator::operator()(const QString &s1, const QString &s2) const
     const icu::UnicodeString us2 = MIcuConversions::qStringToUnicodeString(s2);
     icu::Collator::EComparisonResult result =  d->_coll->compare(us1, us2);
 
-    if (result == Collator::LESS) {
+    if (result == icu::Collator::LESS) {
         return true;
     } else {
         return false;

diff --git a/src/micubreakiterator.cpp b/src/micubreakiterator.cpp
@@ -24,6 +24,8 @@
 #include <unicode/brkiter.h>
 #include <unicode/uchriter.h>
 #include "mlocale_p.h"
+
+using namespace icu;
 #endif
 
 namespace ML10N {

diff --git a/src/micuconversions.cpp b/src/micuconversions.cpp
@@ -21,6 +21,7 @@
 
 #include <QDebug>
 #include <QString>
+
 #include <unicode/unistr.h>
 #include <unicode/datefmt.h>
 
@@ -30,8 +31,7 @@ namespace ML10N {
 
 icu::UnicodeString MIcuConversions::qStringToUnicodeString(const QString &sourceStr)
 {
-    return UnicodeString(static_cast<const UChar *>(sourceStr.utf16()),
-                   sourceStr.length());
+    return icu::UnicodeString(sourceStr.utf16(), sourceStr.length());
 }
 
 QString MIcuConversions::unicodeStringToQString(const icu::UnicodeString &sourceStr)
@@ -76,7 +76,7 @@ icu::DateFormat::EStyle MIcuConversions::toEStyle(MLocale::TimeType timeType)
     }
 
     if (timeType == MLocale::TimeLong) {
-        return DateFormat::kLong;
+        return icu::DateFormat::kLong;
     }
 
     return icu::DateFormat::kFull;

diff --git a/src/mlocale.cpp b/src/mlocale.cpp
@@ -35,6 +35,8 @@
 #include <unicode/dtfmtsym.h> // date format symbols
 #include <unicode/putil.h> // u_setDataDirectory
 #include <unicode/numsys.h>
+
+using namespace icu;
 #endif
 
 #include <MDebug>
@@ -682,9 +684,9 @@ void MLocalePrivate::simplifyDateFormatForMixing(icu::DateFormat *df) const
         icuFormatQString.replace(QLatin1String("ss 's'"), QLatin1String("ss"));
         // kk contains “'ж'.”
         icuFormatQString.replace(QString::fromUtf8("'ж'."), QLatin1String(""));
-        // ru_RU contains “y 'г'.” (e.g. “2008 г.”)
+        // ru_RU contains “y 'г'.” (e.g. “2008 г.”)
         // (note the U+00A0 NO-BREAK SPACE in front of the “'г'.”):
-        icuFormatQString.replace(QString::fromUtf8(" 'г'."), QLatin1String(""));
+        icuFormatQString.replace(QString::fromUtf8(" 'г'."), QLatin1String(""));
         // sv_SE contains “d:'e'” (e.g. “18:e”):
         icuFormatQString.replace(QLatin1String(":'e'"), QLatin1String(""));
         // sv_SE and nb_NO contain “'kl'.”

diff --git a/src/mstringsearch.cpp b/src/mstringsearch.cpp
@@ -234,7 +234,7 @@ void MStringSearchPrivate::icuStringSearchSetCollator()
 {
     clearError();
     _icuStringSearch->setCollator(
-        static_cast<RuleBasedCollator *>(_icuCollator),
+        static_cast<icu::RuleBasedCollator *>(_icuCollator),
         _status);
     if(hasError())
         qWarning() << __PRETTY_FUNCTION__
@@ -288,7 +288,7 @@ MStringSearch::MStringSearch(const QString &pattern, const QString &text, const
     d->_icuStringSearch = new icu::StringSearch(
         MIcuConversions::qStringToUnicodeString(d->_pattern),
         MIcuConversions::qStringToUnicodeString(d->_text),
-        static_cast<RuleBasedCollator *>(d->_icuCollator),
+        static_cast<icu::RuleBasedCollator *>(d->_icuCollator),
         d->_icuBreakIterator,
         d->_status);
     if(d->hasError())

diff --git a/tests/ut_mlocationdatabase/ut_mlocationdatabase.cpp b/tests/ut_mlocationdatabase/ut_mlocationdatabase.cpp
@@ -670,8 +670,8 @@ void Ut_MLocationDatabase::testCitiesDumpInfo()
     foreach(MCity city, cities) {
         UErrorCode status = U_ZERO_ERROR;
         icu::UnicodeString canonicalId;
-        icu::UnicodeString id = static_cast<const UChar *>(city.timeZone().utf16());
-        TimeZone::getCanonicalID (id, canonicalId, status);
+        icu::UnicodeString id = city.timeZone().utf16();
+        icu::TimeZone::getCanonicalID (id, canonicalId, status);
         QString cityCanonicalTimeZoneICU =
             QString(reinterpret_cast<const QChar *>(canonicalId.getBuffer()), canonicalId.length());
         if (cityCanonicalTimeZoneICU.isEmpty())