Hello community, here is the log from the commit of package kunitconversion for openSUSE:Factory checked in at 2018-01-09 14:44:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kunitconversion (Old) and /work/SRC/openSUSE:Factory/.kunitconversion.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kunitconversion" Tue Jan 9 14:44:39 2018 rev:49 rq:559469 version:5.41.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kunitconversion/kunitconversion.changes 2017-11-16 14:41:07.630425841 +0100 +++ /work/SRC/openSUSE:Factory/.kunitconversion.new/kunitconversion.changes 2018-01-09 14:44:41.479719704 +0100 @@ -1,0 +2,12 @@ +Sun Dec 17 09:43:49 CET 2017 - [email protected] + +- Update to 5.41.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.41.0.php +- Changes since 5.40.0: + * Port from QDom to QXmlStreamReader + * Use https for downloading currency exchange rates + * Remove some remove_definition + +------------------------------------------------------------------- Old: ---- kunitconversion-5.40.0.tar.xz New: ---- kunitconversion-5.41.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kunitconversion.spec ++++++ --- /var/tmp/diff_new_pack.knHomA/_old 2018-01-09 14:44:42.203685755 +0100 +++ /var/tmp/diff_new_pack.knHomA/_new 2018-01-09 14:44:42.207685568 +0100 @@ -18,13 +18,13 @@ %bcond_without lang %define lname libKF5UnitConversion5 -%define _tar_path 5.40 +%define _tar_path 5.41 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %global _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} Name: kunitconversion -Version: 5.40.0 +Version: 5.41.0 Release: 0 BuildRequires: cmake >= 3.0 BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} ++++++ kunitconversion-5.40.0.tar.xz -> kunitconversion-5.41.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kunitconversion-5.40.0/CMakeLists.txt new/kunitconversion-5.41.0/CMakeLists.txt --- old/kunitconversion-5.40.0/CMakeLists.txt 2017-11-05 09:39:40.000000000 +0100 +++ new/kunitconversion-5.41.0/CMakeLists.txt 2017-12-02 21:08:47.000000000 +0100 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.40.0") # handled by release scripts -set(KF5_DEP_VERSION "5.40.0") # handled by release scripts +set(KF5_VERSION "5.41.0") # handled by release scripts +set(KF5_DEP_VERSION "5.41.0") # handled by release scripts project(KUnitConversion VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.40.0 NO_MODULE) +find_package(ECM 5.41.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -13,7 +13,7 @@ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) set(REQUIRED_QT_VERSION 5.7.0) -find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core Xml Network) +find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core Network) include(KDEInstallDirs) include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) @@ -35,8 +35,7 @@ find_package(KF5I18n ${KF5_DEP_VERSION} REQUIRED) -remove_definitions(-DQT_NO_CAST_FROM_ASCII) -remove_definitions(-DQT_NO_CAST_FROM_BYTEARRAY) +#remove_definitions(-DQT_NO_CAST_FROM_BYTEARRAY) add_definitions(-DTRANSLATION_DOMAIN=\"kunitconversion5\") if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kunitconversion-5.40.0/autotests/categorytest.cpp new/kunitconversion-5.41.0/autotests/categorytest.cpp --- old/kunitconversion-5.40.0/autotests/categorytest.cpp 2017-11-05 09:39:40.000000000 +0100 +++ new/kunitconversion-5.41.0/autotests/categorytest.cpp 2017-12-02 21:08:47.000000000 +0100 @@ -29,18 +29,18 @@ void CategoryTest::testInfo() { UnitCategory cg = c.category(AreaCategory); - QCOMPARE(cg.name(), QString("Area")); - QCOMPARE(cg.description(), QString("Area")); + QCOMPARE(cg.name(), QStringLiteral("Area")); + QCOMPARE(cg.description(), QStringLiteral("Area")); QCOMPARE(cg.id(), AreaCategory); } void CategoryTest::testUnits() { UnitCategory cg = c.category(MassCategory); - QCOMPARE(cg.defaultUnit().symbol(), QString("kg")); - QCOMPARE(cg.hasUnit(QString("g")), true); - QCOMPARE(cg.unit(QString("g")).symbol(), QString("g")); - QCOMPARE(cg.unit(Kilogram).symbol(), QString("kg")); + QCOMPARE(cg.defaultUnit().symbol(), QStringLiteral("kg")); + QCOMPARE(cg.hasUnit(QStringLiteral("g")), true); + QCOMPARE(cg.unit(QStringLiteral("g")).symbol(), QStringLiteral("g")); + QCOMPARE(cg.unit(Kilogram).symbol(), QStringLiteral("kg")); QVERIFY(cg.units().size() > 0); QVERIFY(cg.allUnits().size() > 0); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kunitconversion-5.40.0/autotests/convertertest.cpp new/kunitconversion-5.41.0/autotests/convertertest.cpp --- old/kunitconversion-5.40.0/autotests/convertertest.cpp 2017-11-05 09:39:40.000000000 +0100 +++ new/kunitconversion-5.41.0/autotests/convertertest.cpp 2017-12-02 21:08:47.000000000 +0100 @@ -37,17 +37,17 @@ void ConverterTest::testCategory() { Converter c; - QCOMPARE(c.categoryForUnit("km").id(), LengthCategory); - QCOMPARE(c.category(QString("Length")).id(), LengthCategory); - QCOMPARE(c.category(LengthCategory).name(), QString("Length")); + QCOMPARE(c.categoryForUnit(QStringLiteral("km")).id(), LengthCategory); + QCOMPARE(c.category(QStringLiteral("Length")).id(), LengthCategory); + QCOMPARE(c.category(LengthCategory).name(), QStringLiteral("Length")); QVERIFY(c.categories().size() > 0); } void ConverterTest::testUnits() { Converter c; - QCOMPARE(c.unit(QString("km")).symbol(), QString("km")); - QCOMPARE(c.unit(Kilogram).symbol(), QString("kg")); + QCOMPARE(c.unit(QStringLiteral("km")).symbol(), QStringLiteral("km")); + QCOMPARE(c.unit(Kilogram).symbol(), QStringLiteral("kg")); } void ConverterTest::testConvert() @@ -64,9 +64,9 @@ void ConverterTest::testInvalid() { Converter c; - QCOMPARE(c.categoryForUnit("does not exist").id(), InvalidCategory); - QCOMPARE(c.unit("does not exist").symbol(), QString()); - QCOMPARE(c.category("does not exist").name(), QString()); + QCOMPARE(c.categoryForUnit(QStringLiteral("does not exist")).id(), InvalidCategory); + QCOMPARE(c.unit(QStringLiteral("does not exist")).symbol(), QString()); + QCOMPARE(c.category(QStringLiteral("does not exist")).name(), QString()); } class CurrencyTestThread : public QThread @@ -76,7 +76,7 @@ void run() Q_DECL_OVERRIDE { Value input = Value(1000, Eur); - Value v = m_c.convert(input, "$"); + Value v = m_c.convert(input, QStringLiteral("$")); number = v.number(); } int number; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kunitconversion-5.40.0/autotests/valuetest.cpp new/kunitconversion-5.41.0/autotests/valuetest.cpp --- old/kunitconversion-5.40.0/autotests/valuetest.cpp 2017-11-05 09:39:40.000000000 +0100 +++ new/kunitconversion-5.41.0/autotests/valuetest.cpp 2017-12-02 21:08:47.000000000 +0100 @@ -36,9 +36,9 @@ void ValueTest::testStrings() { - QCOMPARE(v1.unit().symbol(), QString("km")); - QCOMPARE(v2.toSymbolString(), QString("6.1415 m")); - QCOMPARE(v3.toString(), QString("9.1415 kilometers")); + QCOMPARE(v1.unit().symbol(), QStringLiteral("km")); + QCOMPARE(v2.toSymbolString(), QStringLiteral("6.1415 m")); + QCOMPARE(v3.toString(), QStringLiteral("9.1415 kilometers")); } void ValueTest::testRound() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kunitconversion-5.40.0/po/ca/kunitconversion5.po new/kunitconversion-5.41.0/po/ca/kunitconversion5.po --- old/kunitconversion-5.40.0/po/ca/kunitconversion5.po 2017-11-05 09:39:40.000000000 +0100 +++ new/kunitconversion-5.41.0/po/ca/kunitconversion5.po 2017-12-02 21:08:47.000000000 +0100 @@ -1,24 +1,24 @@ # Translation of kunitconversion5.po to Catalan -# Copyright (C) 2014-2016 This_file_is_part_of_KDE +# Copyright (C) 2014-2017 This_file_is_part_of_KDE # This file is distributed under the license LGPL version 2.1 or # version 3 or later versions approved by the membership of KDE e.V. # # Joan Maspons <[email protected]>, 2009. -# Josep Ma. Ferrer <[email protected]>, 2009, 2010, 2011, 2014, 2016. +# Josep Ma. Ferrer <[email protected]>, 2009, 2010, 2011, 2014, 2016, 2017. # Antoni Bella Pérez <[email protected]>, 2016. msgid "" msgstr "" "Project-Id-Version: kunitconversion5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2016-11-19 20:12+0100\n" -"PO-Revision-Date: 2016-10-18 21:56+0200\n" +"PO-Revision-Date: 2017-11-28 23:44+0100\n" "Last-Translator: Josep Ma. Ferrer <[email protected]>\n" "Language-Team: Catalan <[email protected]>\n" "Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 2.0\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Accelerator-Marker: &\n" @@ -2294,7 +2294,7 @@ #, kde-format msgctxt "currency name" msgid "Mexican Peso" -msgstr "Pes mexicà" +msgstr "Peso mexicà" #: currency.cpp:568 #, kde-format @@ -2346,27 +2346,27 @@ #, kde-format msgctxt "currency name" msgid "New Zealand Dollar" -msgstr "Dòlar de Nova Zelanda" +msgstr "Dòlar neozelandès" #: currency.cpp:591 #, kde-format msgctxt "NZD New Zealand Dollar - unit synonyms for matching user input" msgid "New Zealand dollar;New Zealand dollars" -msgstr "dòlar Nova Zelanda;dòlars Nova Zelanda" +msgstr "dòlar neozelandès;dòlars neozelandesos" #: currency.cpp:596 #, kde-format msgctxt "amount in units (real)" msgid "%1 New Zealand dollars" -msgstr "%1 dòlars de Nova Zelanda" +msgstr "%1 dòlars neozelandesos" #: currency.cpp:597 #, kde-format msgctxt "amount in units (integer)" msgid "%1 New Zealand dollar" msgid_plural "%1 New Zealand dollars" -msgstr[0] "%1 dòlar de Nova Zelanda" -msgstr[1] "%1 dòlars de Nova Zelanda" +msgstr[0] "%1 dòlar neozelandès" +msgstr[1] "%1 dòlars neozelandesos" #: currency.cpp:601 currency.cpp:606 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kunitconversion-5.40.0/po/ca@valencia/kunitconversion5.po new/kunitconversion-5.41.0/po/ca@valencia/kunitconversion5.po --- old/kunitconversion-5.40.0/po/ca@valencia/kunitconversion5.po 2017-11-05 09:39:40.000000000 +0100 +++ new/kunitconversion-5.41.0/po/ca@valencia/kunitconversion5.po 2017-12-02 21:08:47.000000000 +0100 @@ -1,24 +1,24 @@ # Translation of kunitconversion5.po to Catalan (Valencian) -# Copyright (C) 2014-2016 This_file_is_part_of_KDE +# Copyright (C) 2014-2017 This_file_is_part_of_KDE # This file is distributed under the license LGPL version 2.1 or # version 3 or later versions approved by the membership of KDE e.V. # # Joan Maspons <[email protected]>, 2009. -# Josep Ma. Ferrer <[email protected]>, 2009, 2010, 2011, 2014, 2016. +# Josep Ma. Ferrer <[email protected]>, 2009, 2010, 2011, 2014, 2016, 2017. # Antoni Bella Pérez <[email protected]>, 2016. msgid "" msgstr "" "Project-Id-Version: kunitconversion5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2016-11-19 20:12+0100\n" -"PO-Revision-Date: 2016-10-18 21:56+0200\n" +"PO-Revision-Date: 2017-11-28 23:44+0100\n" "Last-Translator: Josep Ma. Ferrer <[email protected]>\n" "Language-Team: Catalan <[email protected]>\n" "Language: ca@valencia\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 2.0\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Accelerator-Marker: &\n" @@ -2294,7 +2294,7 @@ #, kde-format msgctxt "currency name" msgid "Mexican Peso" -msgstr "Pes mexicà" +msgstr "Peso mexicà" #: currency.cpp:568 #, kde-format @@ -2346,27 +2346,27 @@ #, kde-format msgctxt "currency name" msgid "New Zealand Dollar" -msgstr "Dòlar de Nova Zelanda" +msgstr "Dòlar neozelandés" #: currency.cpp:591 #, kde-format msgctxt "NZD New Zealand Dollar - unit synonyms for matching user input" msgid "New Zealand dollar;New Zealand dollars" -msgstr "dòlar Nova Zelanda;dòlars Nova Zelanda" +msgstr "dòlar neozelandés;dòlars neozelandesos" #: currency.cpp:596 #, kde-format msgctxt "amount in units (real)" msgid "%1 New Zealand dollars" -msgstr "%1 dòlars de Nova Zelanda" +msgstr "%1 dòlars neozelandesos" #: currency.cpp:597 #, kde-format msgctxt "amount in units (integer)" msgid "%1 New Zealand dollar" msgid_plural "%1 New Zealand dollars" -msgstr[0] "%1 dòlar de Nova Zelanda" -msgstr[1] "%1 dòlars de Nova Zelanda" +msgstr[0] "%1 dòlar neozelandés" +msgstr[1] "%1 dòlars neozelandesos" #: currency.cpp:601 currency.cpp:606 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kunitconversion-5.40.0/po/ru/kunitconversion5.po new/kunitconversion-5.41.0/po/ru/kunitconversion5.po --- old/kunitconversion-5.40.0/po/ru/kunitconversion5.po 2017-11-05 09:39:40.000000000 +0100 +++ new/kunitconversion-5.41.0/po/ru/kunitconversion5.po 2017-12-02 21:08:47.000000000 +0100 @@ -9,7 +9,7 @@ "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2016-11-19 20:12+0100\n" -"PO-Revision-Date: 2017-03-11 17:35+0300\n" +"PO-Revision-Date: 2017-11-21 12:49+0300\n" "Last-Translator: Alexander Potashev <[email protected]>\n" "Language-Team: Russian <[email protected]>\n" "Language: ru\n" @@ -1384,13 +1384,16 @@ #, kde-format msgctxt "currency name" msgid "Finnish Markka" -msgstr "Финская марка" +msgstr "Финляндская марка" #: currency.cpp:114 #, kde-format msgctxt "FIM Finnish Markka - unit synonyms for matching user input" msgid "markka;markkas;markkaa" -msgstr "финская марка;финских марки;финских марок;финские марки;финских марках" +msgstr "" +"финская марка;финских марки;финских марок;финские марки;финских марках;" +"финляндская марка;финляндских марки;финляндских марок;финляндские марки;" +"финляндских марках" #: currency.cpp:119 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kunitconversion-5.40.0/po/zh_CN/kunitconversion5.po new/kunitconversion-5.41.0/po/zh_CN/kunitconversion5.po --- old/kunitconversion-5.40.0/po/zh_CN/kunitconversion5.po 2017-11-05 09:39:40.000000000 +0100 +++ new/kunitconversion-5.41.0/po/zh_CN/kunitconversion5.po 2017-12-02 21:08:47.000000000 +0100 @@ -20,7 +20,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2016-11-19 20:12+0100\n" -"PO-Revision-Date: 2017-10-19 10:41-0400\n" +"PO-Revision-Date: 2017-11-09 08:34-0500\n" "Last-Translator: guoyunhebrave <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kunitconversion-5.40.0/src/CMakeLists.txt new/kunitconversion-5.41.0/src/CMakeLists.txt --- old/kunitconversion-5.40.0/src/CMakeLists.txt 2017-11-05 09:39:40.000000000 +0100 +++ new/kunitconversion-5.41.0/src/CMakeLists.txt 2017-12-02 21:08:47.000000000 +0100 @@ -40,8 +40,7 @@ target_include_directories(KF5UnitConversion INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KUnitConversion>") target_link_libraries(KF5UnitConversion PUBLIC Qt5::Core - PRIVATE Qt5::Xml - Qt5::Network + PRIVATE Qt5::Network KF5::I18n #i18n(), ... ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kunitconversion-5.40.0/src/currency.cpp new/kunitconversion-5.41.0/src/currency.cpp --- old/kunitconversion-5.40.0/src/currency.cpp 2017-11-05 09:39:40.000000000 +0100 +++ new/kunitconversion-5.41.0/src/currency.cpp 2017-12-02 21:08:47.000000000 +0100 @@ -31,16 +31,16 @@ #include <QtCore/QMutex> #include <QtCore/QSaveFile> #include <QtCore/QStandardPaths> +#include <QtCore/QXmlStreamReader> #include <QtNetwork/QNetworkAccessManager> #include <QtNetwork/QNetworkInterface> #include <QtNetwork/QNetworkReply> #include <QtNetwork/QNetworkRequest> -#include <QtXml/QDomDocument> namespace KUnitConversion { -static const char URL[] = "http://www.ecb.europa.eu/stats/eurofxref/eurofxref-daily.xml";; +static const char URL[] = "https://www.ecb.europa.eu/stats/eurofxref/eurofxref-daily.xml";; class CurrencyCategoryPrivate : public UnitCategoryPrivate { @@ -68,8 +68,8 @@ QStringLiteral("EUR"), i18nc("currency name", "Euro"), i18nc("EUR Euro - unit synonyms for matching user input", "euro;euros") - + ";EUR;" - + QStringLiteral("€") + ';' + + QStringLiteral(";EUR;") + + QStringLiteral("€") + QLatin1Char(';') + i18nc("currency name", "Euro"), symbolString, ki18nc("amount in units (real)", "%1 euros"), @@ -79,8 +79,8 @@ QStringLiteral("ATS"), i18nc("currency name", "Austrian Schilling"), i18nc("ATS Austrian Schilling - unit synonyms for matching user input", "schilling;schillings") - + ";ATS;" - + QLocale::countryToString(QLocale::Austria) + ';' + + QStringLiteral(";ATS;") + + QLocale::countryToString(QLocale::Austria) + QLatin1Char(';') + i18nc("currency name", "Austrian Schilling"), symbolString, ki18nc("amount in units (real)", "%1 schillings"), @@ -90,8 +90,8 @@ QStringLiteral("BEF"), i18nc("currency name", "Belgian Franc"), i18nc("BEF Belgian Franc - unit synonyms for matching user input", "franc;francs") - + ";BEF;" - + QLocale::countryToString(QLocale::Belgium) + ';' + + QStringLiteral(";BEF;") + + QLocale::countryToString(QLocale::Belgium) + QLatin1Char(';') + i18nc("currency name", "Belgian Franc"), symbolString, ki18nc("amount in units (real)", "%1 Belgian francs"), @@ -101,8 +101,8 @@ QStringLiteral("NLG"), i18nc("currency name", "Netherlands Guilder"), i18nc("NLG Netherlands Guilder - unit synonyms for matching user input", "guilder;guilders") - + ";NLG;" - + QLocale::countryToString(QLocale::Netherlands) + ';' + + QStringLiteral(";NLG;") + + QLocale::countryToString(QLocale::Netherlands) + QLatin1Char(';') + i18nc("currency name", "Netherlands Guilder"), symbolString, ki18nc("amount in units (real)", "%1 guilders"), @@ -112,8 +112,8 @@ QStringLiteral("FIM"), i18nc("currency name", "Finnish Markka"), i18nc("FIM Finnish Markka - unit synonyms for matching user input", "markka;markkas;markkaa") - + ";FIM;" - + QLocale::countryToString(QLocale::Finland) + ';' + + QStringLiteral(";FIM;") + + QLocale::countryToString(QLocale::Finland) + QLatin1Char(';') + i18nc("currency name", "Finnish Markka"), symbolString, ki18nc("amount in units (real)", "%1 markkas"), @@ -123,8 +123,8 @@ QStringLiteral("FRF"), i18nc("currency name", "French Franc"), i18nc("FRF French Franc - unit synonyms for matching user input", "franc;francs") - + ";FRF;" - + QLocale::countryToString(QLocale::France) + ';' + + QStringLiteral(";FRF;") + + QLocale::countryToString(QLocale::France) + QLatin1Char(';') + i18nc("currency name", "French Franc"), symbolString, ki18nc("amount in units (real)", "%1 French francs"), @@ -134,8 +134,8 @@ QStringLiteral("DEM"), i18nc("currency name", "German Mark"), i18nc("DEM German Mark - unit synonyms for matching user input", "mark;marks") - + ";DEM;" - + QLocale::countryToString(QLocale::Germany) + ';' + + QStringLiteral(";DEM;") + + QLocale::countryToString(QLocale::Germany) + QLatin1Char(';') + i18nc("currency name", "German Mark"), symbolString, ki18nc("amount in units (real)", "%1 marks"), @@ -145,8 +145,8 @@ QStringLiteral("IEP"), i18nc("currency name", "Irish Pound"), i18nc("IEP Irish Pound - unit synonyms for matching user input", "Irish pound;Irish pounds") - + ";IEP;" - + QLocale::countryToString(QLocale::Ireland) + ';' + + QStringLiteral(";IEP;") + + QLocale::countryToString(QLocale::Ireland) + QLatin1Char(';') + i18nc("currency name", "Irish Pound"), symbolString, ki18nc("amount in units (real)", "%1 Irish pounds"), @@ -156,8 +156,8 @@ QStringLiteral("ITL"), i18nc("currency name", "Italian Lira"), i18nc("ITL Italian Lira - unit synonyms for matching user input", "lira;liras") - + ";ITL;" - + QLocale::countryToString(QLocale::Italy) + ';' + + QStringLiteral(";ITL;") + + QLocale::countryToString(QLocale::Italy) + QLatin1Char(';') + i18nc("currency name", "Italian Lira"), symbolString, ki18nc("amount in units (real)", "%1 Italian lira"), @@ -167,8 +167,8 @@ QStringLiteral("LUF"), i18nc("currency name", "Luxembourgish Franc"), i18nc("LUF Luxembourgish Franc - unit synonyms for matching user input", "franc;francs") - + ";LUF;" - + QLocale::countryToString(QLocale::Luxembourg) + ';' + + QStringLiteral(";LUF;") + + QLocale::countryToString(QLocale::Luxembourg) + QLatin1Char(';') + i18nc("currency name", "Luxembourgish Franc"), symbolString, ki18nc("amount in units (real)", "%1 Luxembourgish francs"), @@ -178,8 +178,8 @@ QStringLiteral("PTE"), i18nc("currency name", "Portuguese Escudo"), i18nc("PTE Portuguese Escudo - unit synonyms for matching user input", "escudo;escudos") - + ";PTE;" - + QLocale::countryToString(QLocale::Portugal) + ';' + + QStringLiteral(";PTE;") + + QLocale::countryToString(QLocale::Portugal) + QLatin1Char(';') + i18nc("currency name", "Portuguese Escudo"), symbolString, ki18nc("amount in units (real)", "%1 escudos"), @@ -189,8 +189,8 @@ QStringLiteral("ESP"), i18nc("currency name", "Spanish Peseta"), i18nc("ESP Spanish Peseta - unit synonyms for matching user input", "peseta;pesetas") - + ";ESP;" - + QLocale::countryToString(QLocale::Spain) + ';' + + QStringLiteral(";ESP;") + + QLocale::countryToString(QLocale::Spain) + QLatin1Char(';') + i18nc("currency name", "Spanish Peseta"), symbolString, ki18nc("amount in units (real)", "%1 pesetas"), @@ -200,8 +200,8 @@ QStringLiteral("GRD"), i18nc("currency name", "Greek Drachma"), i18nc("GRD Greek Drachma - unit synonyms for matching user input", "drachma;drachmas") - + ";GRD;" - + QLocale::countryToString(QLocale::Greece) + ';' + + QStringLiteral(";GRD;") + + QLocale::countryToString(QLocale::Greece) + QLatin1Char(';') + i18nc("currency name", "Greek Drachma"), symbolString, ki18nc("amount in units (real)", "%1 drachmas"), @@ -211,8 +211,8 @@ QStringLiteral("SIT"), i18nc("currency name", "Slovenian Tolar"), i18nc("SIT Slovenian Tolar - unit synonyms for matching user input", "tolar;tolars;tolarjev") - + ";SIT;" - + QLocale::countryToString(QLocale::Slovenia) + ';' + + QStringLiteral(";SIT;") + + QLocale::countryToString(QLocale::Slovenia) + QLatin1Char(';') + i18nc("currency name", "Slovenian Tolar"), symbolString, ki18nc("amount in units (real)", "%1 tolars"), @@ -223,8 +223,8 @@ i18nc("currency name", "Cypriot Pound"), i18nc("CYP Cypriot Pound - unit synonyms for matching user input", "Cypriot pound;Cypriot pounds") - + ";CYP;" - + QLocale::countryToString(QLocale::Cyprus) + ';' + + QStringLiteral(";CYP;") + + QLocale::countryToString(QLocale::Cyprus) + QLatin1Char(';') + i18nc("currency name", "Cypriot Pound"), symbolString, ki18nc("amount in units (real)", "%1 Cypriot pounds"), @@ -234,8 +234,8 @@ QStringLiteral("MTL"), i18nc("currency name", "Maltese Lira"), i18nc("MTL Maltese Lira - unit synonyms for matching user input", "Maltese lira") - + ";MTL;" - + QLocale::countryToString(QLocale::Malta) + ';' + + QStringLiteral(";MTL;") + + QLocale::countryToString(QLocale::Malta) + QLatin1Char(';') + i18nc("currency name", "Maltese Lira"), symbolString, ki18nc("amount in units (real)", "%1 Maltese lira"), @@ -246,8 +246,8 @@ i18nc("currency name", "Slovak Koruna"), i18nc("SKK Slovak Koruna - unit synonyms for matching user input", "koruna;korunas;koruny;korun") - + ";SKK;" - + QLocale::countryToString(QLocale::Slovakia) + ';' + + QStringLiteral(";SKK;") + + QLocale::countryToString(QLocale::Slovakia) + QLatin1Char(';') + i18nc("currency name", "Slovak Koruna"), symbolString, ki18nc("amount in units (real)", "%1 Slovak korunas"), @@ -259,8 +259,8 @@ QStringLiteral("USD"), i18nc("currency name", "United States Dollar"), i18nc("USD United States Dollar - unit synonyms for matching user input", "dollar;dollars") - + ";USD;$;" - + QLocale::countryToString(QLocale::UnitedStates) + ';' + + QStringLiteral(";USD;$;") + + QLocale::countryToString(QLocale::UnitedStates) + QLatin1Char(';') + i18nc("currency name", "United States Dollar"), symbolString, ki18nc("amount in units (real)", "%1 United States dollars"), @@ -270,9 +270,9 @@ QStringLiteral("JPY"), i18nc("currency name", "Japanese Yen"), i18nc("JPY Japanese Yen - unit synonyms for matching user input", "yen") - + ";JPY;" - + QStringLiteral("¥") + ';' - + QLocale::countryToString(QLocale::Japan) + ';' + + QStringLiteral(";JPY;") + + QStringLiteral("¥") + QLatin1Char(';') + + QLocale::countryToString(QLocale::Japan) + QLatin1Char(';') + i18nc("currency name", "Japanese Yen"), symbolString, ki18nc("amount in units (real)", "%1 yen"), @@ -282,8 +282,8 @@ QStringLiteral("BGN"), i18nc("currency name", "Bulgarian Lev"), i18nc("BGN Bulgarian Lev - unit synonyms for matching user input", "lev;leva") - + ";BGN;" - + QLocale::countryToString(QLocale::Bulgaria) + ';' + + QStringLiteral(";BGN;") + + QLocale::countryToString(QLocale::Bulgaria) + QLatin1Char(';') + i18nc("currency name", "Bulgarian Lev"), symbolString, ki18nc("amount in units (real)", "%1 leva"), @@ -293,8 +293,8 @@ QStringLiteral("CZK"), i18nc("currency name", "Czech Koruna"), i18nc("CZK Czech Koruna - unit synonyms for matching user input", "koruna;korunas") - + ";CZK;" - + QLocale::countryToString(QLocale::CzechRepublic) + ';' + + QStringLiteral(";CZK;") + + QLocale::countryToString(QLocale::CzechRepublic) + QLatin1Char(';') + i18nc("currency name", "Czech Koruna"), symbolString, ki18nc("amount in units (real)", "%1 Czech korunas"), @@ -305,8 +305,8 @@ QStringLiteral("DKK"), i18nc("currency name", "Danish Krone"), i18nc("DKK Danish Krone - unit synonyms for matching user input", "Danish krone;Danish kroner") - + ";DKK;" - + QLocale::countryToString(QLocale::Denmark) + ';' + + QStringLiteral(";DKK;") + + QLocale::countryToString(QLocale::Denmark) + QLatin1Char(';') + i18nc("currency name", "Danish Krone"), symbolString, ki18nc("amount in units (real)", "%1 Danish kroner"), @@ -316,8 +316,8 @@ QStringLiteral("EEK"), i18nc("currency name", "Estonian Kroon"), i18nc("EEK Estonian Kroon - unit synonyms for matching user input", "kroon;kroons;krooni") - + ";EEK;" - + QLocale::countryToString(QLocale::Estonia) + ';' + + QStringLiteral(";EEK;") + + QLocale::countryToString(QLocale::Estonia) + QLatin1Char(';') + i18nc("currency name", "Estonian Kroon"), symbolString, ki18nc("amount in units (real)", "%1 kroons"), @@ -328,9 +328,9 @@ i18nc("currency name", "British Pound"), i18nc("GBP British Pound - unit synonyms for matching user input", "pound;pounds;pound sterling;pounds sterling") - + ";GBP;" - + QStringLiteral("£") + ';' - + QLocale::countryToString(QLocale::UnitedKingdom) + ';' + + QStringLiteral(";GBP;") + + QStringLiteral("£") + QLatin1Char(';') + + QLocale::countryToString(QLocale::UnitedKingdom) + QLatin1Char(';') + i18nc("currency name", "British Pound"), symbolString, ki18nc("amount in units (real)", "%1 pounds sterling"), @@ -340,8 +340,8 @@ QStringLiteral("HUF"), i18nc("currency name", "Hungarian Forint"), i18nc("HUF hungarian Forint - unit synonyms for matching user input", "forint") - + ";HUF;" - + QLocale::countryToString(QLocale::Hungary) + ';' + + QStringLiteral(";HUF;") + + QLocale::countryToString(QLocale::Hungary) + QLatin1Char(';') + i18nc("currency name", "Hungarian Forint"), symbolString, ki18nc("amount in units (real)", "%1 forint"), @@ -351,8 +351,8 @@ QStringLiteral("ILS"), i18nc("currency name", "Israeli New Shekel"), i18nc("ILS Israeli New Shekel - unit synonyms for matching user input", "shekel;shekels;sheqel;sheqels;sheqalim") - + ";ILS;" - + QLocale::countryToString(QLocale::Israel) + ';' + + QStringLiteral(";ILS;") + + QLocale::countryToString(QLocale::Israel) + QLatin1Char(';') + i18nc("currency name", "Israeli New Shekel"), symbolString, ki18nc("amount in units (real)", "%1 shekels"), @@ -362,8 +362,8 @@ QStringLiteral("LTL"), i18nc("currency name", "Lithuanian Litas"), i18nc("LTL Lithuanian Litas - unit synonyms for matching user input", "litas;litai;litu") - + ";LTL;" - + QLocale::countryToString(QLocale::Lithuania) + ';' + + QStringLiteral(";LTL;") + + QLocale::countryToString(QLocale::Lithuania) + QLatin1Char(';') + i18nc("currency name", "Lithuanian Litas"), symbolString, ki18nc("amount in units (real)", "%1 litas"), @@ -373,8 +373,8 @@ QStringLiteral("LVL"), i18nc("currency name", "Latvian Lats"), i18nc("LVL Latvian Lats - unit synonyms for matching user input", "lats;lati") - + ";LVL;" - + QLocale::countryToString(QLocale::Latvia) + ';' + + QStringLiteral(";LVL;") + + QLocale::countryToString(QLocale::Latvia) + QLatin1Char(';') + i18nc("currency name", "Latvian Lats"), symbolString, ki18nc("amount in units (real)", "%1 lati"), @@ -384,8 +384,8 @@ QStringLiteral("PLN"), i18nc("currency name", "Polish Zloty"), i18nc("PLN Polish Zloty - unit synonyms for matching user input", "zloty;zlotys;zloties") - + ";PLN;" - + QLocale::countryToString(QLocale::Poland) + ';' + + QStringLiteral(";PLN;") + + QLocale::countryToString(QLocale::Poland) + QLatin1Char(';') + i18nc("currency name", "Polish Zloty"), symbolString, ki18nc("amount in units (real)", "%1 zlotys"), @@ -395,8 +395,8 @@ QStringLiteral("RON"), i18nc("currency name", "Romanian Leu"), i18nc("RON Romanian Leu - unit synonyms for matching user input", "leu;lei") - + ";RON;" - + QLocale::countryToString(QLocale::Romania) + ';' + + QStringLiteral(";RON;") + + QLocale::countryToString(QLocale::Romania) + QLatin1Char(';') + i18nc("currency name", "Romanian Leu"), symbolString, ki18nc("amount in units (real)", "%1 lei"), @@ -406,8 +406,8 @@ QStringLiteral("SEK"), i18nc("currency name", "Swedish Krona"), i18nc("SEK Swedish Krona - unit synonyms for matching user input", "krona;kronor") - + ";SEK;" - + QLocale::countryToString(QLocale::Sweden) + ';' + + QStringLiteral(";SEK;") + + QLocale::countryToString(QLocale::Sweden) + QLatin1Char(';') + i18nc("currency name", "Swedish Krona"), symbolString, ki18nc("amount in units (real)", "%1 kronor"), @@ -417,8 +417,8 @@ QStringLiteral("CHF"), i18nc("currency name", "Swiss Franc"), i18nc("CHF Swiss Franc - unit synonyms for matching user input", "franc;francs") - + ";CHF;" - + QLocale::countryToString(QLocale::Switzerland) + ';' + + QStringLiteral(";CHF;") + + QLocale::countryToString(QLocale::Switzerland) + QLatin1Char(';') + i18nc("currency name", "Swiss Franc"), symbolString, ki18nc("amount in units (real)", "%1 Swiss francs"), @@ -429,8 +429,8 @@ i18nc("currency name", "Norwegian Krone"), i18nc("Norwegian Krone - unit synonyms for matching user input", "Norwegian krone;Norwegian kroner") - + ";NOK;" - + QLocale::countryToString(QLocale::Norway) + ';' + + QStringLiteral(";NOK;") + + QLocale::countryToString(QLocale::Norway) + QLatin1Char(';') + i18nc("currency name", "Norwegian Krone"), symbolString, ki18nc("amount in units (real)", "%1 Norwegian kroner"), @@ -440,8 +440,8 @@ QStringLiteral("HRK"), i18nc("currency name", "Croatian Kuna"), i18nc("HRK Croatian Kuna - unit synonyms for matching user input", "kuna;kune") - + ";HRK;" - + QLocale::countryToString(QLocale::Croatia) + ';' + + QStringLiteral(";HRK;") + + QLocale::countryToString(QLocale::Croatia) + QLatin1Char(';') + i18nc("currency name", "Croatian Kuna"), symbolString, ki18nc("amount in units (real)", "%1 kune"), @@ -452,8 +452,8 @@ i18nc("currency name", "Russian Ruble"), i18nc("RUB Russian Ruble - unit synonyms for matching user input", "ruble;rubles;rouble;roubles") - + ";RUB;" - + QLocale::countryToString(QLocale::Russia) + ';' + + QStringLiteral(";RUB;") + + QLocale::countryToString(QLocale::Russia) + QLatin1Char(';') + i18nc("currency name", "Russian Ruble"), symbolString, ki18nc("amount in units (real)", "%1 rubles"), @@ -463,8 +463,8 @@ QStringLiteral("TRY"), i18nc("currency name", "Turkish Lira"), i18nc("TRY Turkish Lira - unit synonyms for matching user input", "lira") - + ";TRY;" - + QLocale::countryToString(QLocale::Turkey) + ';' + + QStringLiteral(";TRY;") + + QLocale::countryToString(QLocale::Turkey) + QLatin1Char(';') + i18nc("currency name", "Turkish Lira"), symbolString, ki18nc("amount in units (real)", "%1 Turkish lira"), @@ -475,8 +475,8 @@ i18nc("currency name", "Australian Dollar"), i18nc("AUD Australian Dollar - unit synonyms for matching user input", "Australian dollar;Australian dollars") - + ";AUD;" - + QLocale::countryToString(QLocale::Australia) + ';' + + QStringLiteral(";AUD;") + + QLocale::countryToString(QLocale::Australia) + QLatin1Char(';') + i18nc("currency name", "Australian Dollar"), symbolString, ki18nc("amount in units (real)", "%1 Australian dollars"), @@ -486,8 +486,8 @@ QStringLiteral("BRL"), i18nc("currency name", "Brazilian Real"), i18nc("BRL Brazilian Real - unit synonyms for matching user input", "real;reais") - + ";BRL;" - + QLocale::countryToString(QLocale::Brazil) + ';' + + QStringLiteral(";BRL;") + + QLocale::countryToString(QLocale::Brazil) + QLatin1Char(';') + i18nc("currency name", "Brazilian Real"), symbolString, ki18nc("amount in units (real)", "%1 reais"), @@ -498,8 +498,8 @@ i18nc("currency name", "Canadian Dollar"), i18nc("Canadian Dollar - unit synonyms for matching user input", "Canadian dollar;Canadian dollars") - + ";CAD;" - + QLocale::countryToString(QLocale::Canada) + ';' + + QStringLiteral(";CAD;") + + QLocale::countryToString(QLocale::Canada) + QLatin1Char(';') + i18nc("currency name", "Canadian Dollar"), symbolString, ki18nc("amount in units (real)", "%1 Canadian dollars"), @@ -509,8 +509,8 @@ QStringLiteral("CNY"), i18nc("currency name", "Chinese Yuan"), i18nc("Chinese Yuan - unit synonyms for matching user input", "yuan") - + ";CNY;" - + QLocale::countryToString(QLocale::China) + ';' + + QStringLiteral(";CNY;") + + QLocale::countryToString(QLocale::China) + QLatin1Char(';') + i18nc("currency name", "Chinese Yuan"), symbolString, ki18nc("amount in units (real)", "%1 yuan"), @@ -521,8 +521,8 @@ i18nc("currency name", "Hong Kong Dollar"), i18nc("Hong Kong Dollar - unit synonyms for matching user input", "Hong Kong dollar;Hong Kong dollars") - + ";HKD;" - + QLocale::countryToString(QLocale::HongKong) + ';' + + QStringLiteral(";HKD;") + + QLocale::countryToString(QLocale::HongKong) + QLatin1Char(';') + i18nc("currency name", "Hong Kong Dollar"), symbolString, ki18nc("amount in units (real)", "%1 Hong Kong dollars"), @@ -531,9 +531,9 @@ addUnit(CustomUnit(CurrencyCategory, Idr, qSNaN(), QStringLiteral("IDR"), i18nc("currency name", "Indonesian Rupiah"), - i18nc("IDR Indonesian Rupiah - unit synonyms for matching user input", "rupiah;rupiahs") + - + ";IDR;" - + QLocale::countryToString(QLocale::Indonesia) + ';' + i18nc("IDR Indonesian Rupiah - unit synonyms for matching user input", "rupiah;rupiahs") + + QStringLiteral(";IDR;") + + QLocale::countryToString(QLocale::Indonesia) + QLatin1Char(';') + i18nc("currency name", "Indonesian Rupiah"), symbolString, ki18nc("amount in units (real)", "%1 rupiahs"), @@ -543,8 +543,8 @@ QStringLiteral("INR"), i18nc("currency name", "Indian Rupee"), i18nc("INR Indian Rupee - unit synonyms for matching user input", "rupee;rupees") - + ";INR;" - + QLocale::countryToString(QLocale::India) + ';' + + QStringLiteral(";INR;") + + QLocale::countryToString(QLocale::India) + QLatin1Char(';') + i18nc("currency name", "Indian Rupee"), symbolString, ki18nc("amount in units (real)", "%1 rupees"), @@ -554,8 +554,8 @@ QStringLiteral("KRW"), i18nc("currency name", "Korean Won"), i18nc("KRW Korean Won - unit synonyms for matching user input", "won") - + ";KRW;" - + QLocale::countryToString(QLocale::SouthKorea) + ';' + + QStringLiteral(";KRW;") + + QLocale::countryToString(QLocale::SouthKorea) + QLatin1Char(';') + i18nc("currency name", "Korean Won"), symbolString, ki18nc("amount in units (real)", "%1 won"), @@ -566,8 +566,8 @@ i18nc("currency name", "Mexican Peso"), i18nc("MXN Mexican Peso - unit synonyms for matching user input", "Mexican peso;Mexican pesos") - + ";MXN;" - + QLocale::countryToString(QLocale::Mexico) + ';' + + QStringLiteral(";MXN;") + + QLocale::countryToString(QLocale::Mexico) + QLatin1Char(';') + i18nc("currency name", "Mexican Peso"), symbolString, ki18nc("amount in units (real)", "%1 Mexican pesos"), @@ -577,8 +577,8 @@ QStringLiteral("MYR"), i18nc("currency name", "Malaysian Ringgit"), i18nc("MYR Malaysian Ringgit - unit synonyms for matching user input", "ringgit;ringgits") - + ";MYR;" - + QLocale::countryToString(QLocale::Malaysia) + ';' + + QStringLiteral(";MYR;") + + QLocale::countryToString(QLocale::Malaysia) + QLatin1Char(';') + i18nc("currency name", "Malaysian Ringgit"), symbolString, ki18nc("amount in units (real)", "%1 ringgit"), @@ -589,8 +589,8 @@ i18nc("currency name", "New Zealand Dollar"), i18nc("NZD New Zealand Dollar - unit synonyms for matching user input", "New Zealand dollar;New Zealand dollars") - + ";NZD;" - + QLocale::countryToString(QLocale::NewZealand) + ';' + + QStringLiteral(";NZD;") + + QLocale::countryToString(QLocale::NewZealand) + QLatin1Char(';') + i18nc("currency name", "New Zealand Dollar"), symbolString, ki18nc("amount in units (real)", "%1 New Zealand dollars"), @@ -601,8 +601,8 @@ i18nc("currency name", "Philippine Peso"), i18nc("PHP Philippine Peso - unit synonyms for matching user input", "Philippine peso;Philippine pesos") - + ";PHP;" - + QLocale::countryToString(QLocale::Philippines) + ';' + + QStringLiteral(";PHP;") + + QLocale::countryToString(QLocale::Philippines) + QLatin1Char(';') + i18nc("currency name", "Philippine Peso"), symbolString, ki18nc("amount in units (real)", "%1 Philippine pesos"), @@ -613,8 +613,8 @@ i18nc("currency name", "Singapore Dollar"), i18nc("SGD Singapore Dollar - unit synonyms for matching user input", "Singapore dollar;Singapore dollars") - + ";SGD;" - + QLocale::countryToString(QLocale::Singapore) + ';' + + QStringLiteral(";SGD;") + + QLocale::countryToString(QLocale::Singapore) + QLatin1Char(';') + i18nc("currency name", "Singapore Dollar"), symbolString, ki18nc("amount in units (real)", "%1 Singapore dollars"), @@ -624,8 +624,8 @@ QStringLiteral("THB"), i18nc("currency name", "Thai Baht"), i18nc("THB Thai Baht - unit synonyms for matching user input", "baht") - + ";THB;" - + QLocale::countryToString(QLocale::Thailand) + ';' + + QStringLiteral(";THB;") + + QLocale::countryToString(QLocale::Thailand) + QLatin1Char(';') + i18nc("currency name", "Thai Baht"), symbolString, ki18nc("amount in units (real)", "%1 baht"), @@ -635,8 +635,8 @@ QStringLiteral("ZAR"), i18nc("currency name", "South African Rand"), i18nc("South African Rand - unit synonyms for matching user input", "rand") - + ";ZAR;" - + QLocale::countryToString(QLocale::SouthAfrica) + ';' + + QStringLiteral(";ZAR;") + + QLocale::countryToString(QLocale::SouthAfrica) + QLatin1Char(';') + i18nc("currency name", "South African Rand"), symbolString, ki18nc("amount in units (real)", "%1 rand"), @@ -669,7 +669,7 @@ // Bug 345750: QNetworkReply does not work without an event loop and doesn't implement waitForReadyRead() QEventLoop loop; QNetworkAccessManager manager; - auto *reply = manager.get(QNetworkRequest(QUrl(URL))); // reply is owned by the network access manager + auto *reply = manager.get(QNetworkRequest(QUrl(QString::fromLatin1(URL)))); // reply is owned by the network access manager QObject::connect(reply, &QNetworkReply::finished, [&] { if (!reply->error()) { const QString cacheDir = info.absolutePath(); @@ -700,20 +700,25 @@ if (m_update) { QFile file(m_cache); if (file.open(QIODevice::ReadOnly)) { - QDomDocument doc; - if (doc.setContent(&file, false)) { - QDomNodeList list = doc.elementsByTagName(QStringLiteral("Cube")); - for (int i = 0; i < list.count(); ++i) { - const QDomElement e = list.item(i).toElement(); - if (e.hasAttribute(QStringLiteral("currency"))) { - Unit u = m_unitMap.value(e.attribute(QStringLiteral("currency"))); - if (u.isValid()) { - u.setUnitMultiplier(1.0 / e.attribute(QStringLiteral("rate")).toDouble()); + QXmlStreamReader xml(&file); + while (!xml.atEnd()) { + xml.readNext(); + + if (xml.isStartElement() && xml.name() == QLatin1String("Cube")) { + const auto attributes = xml.attributes(); + if (attributes.hasAttribute(QLatin1String("currency"))) { + Unit unit = m_unitMap.value(attributes.value(QLatin1String("currency")).toString()); + if (unit.isValid()) { + const auto multiplier = attributes.value(QLatin1String("rate")).toDouble(); + if (!qFuzzyIsNull(multiplier)) { + unit.setUnitMultiplier(1.0 / multiplier); + } } } } - m_update = false; } + + m_update = xml.hasError(); } } mutex.unlock(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kunitconversion-5.40.0/src/unitcategory.cpp new/kunitconversion-5.41.0/src/unitcategory.cpp --- old/kunitconversion-5.40.0/src/unitcategory.cpp 2017-11-05 09:39:40.000000000 +0100 +++ new/kunitconversion-5.41.0/src/unitcategory.cpp 2017-12-02 21:08:47.000000000 +0100 @@ -228,7 +228,7 @@ { if (d) { unit.d->m_category = *this; - const QStringList list = unit.d->m_matchString.split(';'); + const QStringList list = unit.d->m_matchString.split(QLatin1Char(';')); foreach (const QString &name, list) d->m_unitMap[name] = unit; d->m_idMap[unit.id()] = unit;
