diff -Nru kemoticons-5.61.0/autotests/kemoticontest.cpp kemoticons-5.62.0/autotests/kemoticontest.cpp --- kemoticons-5.61.0/autotests/kemoticontest.cpp 2019-08-03 19:32:34.000000000 +0000 +++ kemoticons-5.62.0/autotests/kemoticontest.cpp 2019-09-07 12:34:32.000000000 +0000 @@ -120,7 +120,7 @@ QString result = emo.parseEmoticons(inputData, KEmoticonsTheme::RelaxedParse | KEmoticonsTheme::SkipHTML); - result.replace(QStringLiteral("file://") + themePath + themeName + QLatin1Char('/'), QString()); + result.remove(QStringLiteral("file://") + themePath + themeName + QLatin1Char('/')); if (xfail) { QEXPECT_FAIL("", "Checking known-broken testcase", Continue); @@ -161,8 +161,8 @@ const QString parsed = theme.parseEmoticons(QStringLiteral(":)")); - QVERIFY(parsed.contains(QStringLiteral("width=\"99\""))); - QVERIFY(parsed.contains(QStringLiteral("height=\"77\""))); + QVERIFY(parsed.contains(QLatin1String("width=\"99\""))); + QVERIFY(parsed.contains(QLatin1String("height=\"77\""))); } private: diff -Nru kemoticons-5.61.0/CMakeLists.txt kemoticons-5.62.0/CMakeLists.txt --- kemoticons-5.61.0/CMakeLists.txt 2019-08-03 19:32:34.000000000 +0000 +++ kemoticons-5.62.0/CMakeLists.txt 2019-09-07 12:34:32.000000000 +0000 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.61.0") # handled by release scripts -set(KF5_DEP_VERSION "5.61.0") # handled by release scripts +set(KF5_VERSION "5.62.0") # handled by release scripts +set(KF5_DEP_VERSION "5.62.0") # handled by release scripts project(KEmoticons VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.61.0 NO_MODULE) +find_package(ECM 5.62.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) diff -Nru kemoticons-5.61.0/debian/changelog kemoticons-5.62.0/debian/changelog --- kemoticons-5.61.0/debian/changelog 2019-08-12 09:42:00.000000000 +0000 +++ kemoticons-5.62.0/debian/changelog 2019-09-14 07:06:30.000000000 +0000 @@ -1,3 +1,9 @@ +kemoticons (5.62.0-0ubuntu1) eoan; urgency=medium + + * New upstream release (5.62.0) + + -- Rik Mills Sat, 14 Sep 2019 08:06:30 +0100 + kemoticons (5.61.0-0ubuntu1) eoan; urgency=medium * New upstream release (5.61.0) diff -Nru kemoticons-5.61.0/debian/control kemoticons-5.62.0/debian/control --- kemoticons-5.61.0/debian/control 2019-08-12 09:42:00.000000000 +0000 +++ kemoticons-5.62.0/debian/control 2019-09-14 07:06:30.000000000 +0000 @@ -6,12 +6,12 @@ Build-Depends: cmake (>= 3.0~), debhelper (>= 11~), doxygen, - extra-cmake-modules (>= 5.61.0~), + extra-cmake-modules (>= 5.62.0~), graphviz, - libkf5archive-dev (>= 5.61.0~), - libkf5config-dev (>= 5.61.0~), - libkf5coreaddons-dev (>= 5.61.0~), - libkf5service-dev (>= 5.61.0~), + libkf5archive-dev (>= 5.62.0~), + libkf5config-dev (>= 5.62.0~), + libkf5coreaddons-dev (>= 5.62.0~), + libkf5service-dev (>= 5.62.0~), libqt5sql5-sqlite, pkg-kde-tools (>= 0.15.15ubuntu1~), qtbase5-dev (>= 5.8.0~), @@ -51,9 +51,9 @@ Package: libkf5emoticons-dev Architecture: any Section: libdevel -Depends: libkf5archive-dev (>= 5.61.0~), +Depends: libkf5archive-dev (>= 5.62.0~), libkf5emoticons5 (= ${binary:Version}), - libkf5service-dev (>= 5.61.0~), + libkf5service-dev (>= 5.62.0~), qtbase5-dev (>= 5.8.0~), ${misc:Depends}, Recommends: libkf5emoticons-doc (= ${source:Version}) diff -Nru kemoticons-5.61.0/src/core/kemoticons.cpp kemoticons-5.62.0/src/core/kemoticons.cpp --- kemoticons-5.61.0/src/core/kemoticons.cpp 2019-08-03 19:32:34.000000000 +0000 +++ kemoticons-5.62.0/src/core/kemoticons.cpp 2019-09-07 12:34:32.000000000 +0000 @@ -131,7 +131,7 @@ for (const KPluginMetaData &plugin : qAsConst(m_plugins)) { const QString fName = plugin.rawData().value(QStringLiteral("X-KDE-EmoticonsFileName")).toString(); - const QString path = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("emoticons/") + name + QLatin1Char('/') + fName); + const QString path = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QLatin1String("emoticons/") + name + QLatin1Char('/') + fName); if (QFile::exists(path)) { KEmoticonsProvider *provider = loadProvider(plugin); @@ -143,7 +143,7 @@ // KF6: remove support for old plugins for (const KService::Ptr &service : qAsConst(m_oldStylePlugins)) { const QString fName = service->property(QStringLiteral("X-KDE-EmoticonsFileName")).toString(); - const QString path = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("emoticons/") + name + QLatin1Char('/') + fName); + const QString path = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QLatin1String("emoticons/") + name + QLatin1Char('/') + fName); if (QFile::exists(path)) { KEmoticonsProvider *provider = loadProvider(service); diff -Nru kemoticons-5.61.0/src/providers/adium/adium_emoticons.cpp kemoticons-5.62.0/src/providers/adium/adium_emoticons.cpp --- kemoticons-5.61.0/src/providers/adium/adium_emoticons.cpp 2019-08-03 19:32:34.000000000 +0000 +++ kemoticons-5.62.0/src/providers/adium/adium_emoticons.cpp 2019-09-07 12:34:32.000000000 +0000 @@ -174,7 +174,7 @@ QDomElement de = nl.item(i).toElement(); if (!de.isNull() && de.tagName() == QLatin1String("key")) { - name = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("emoticons/") + themeName() + QLatin1Char('/') + de.text()); + name = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QLatin1String("emoticons/") + themeName() + QLatin1Char('/') + de.text()); continue; } else if (!de.isNull() && de.tagName() == QLatin1String("dict")) { QDomElement arr = de.firstChildElement(QStringLiteral("array")); @@ -201,7 +201,7 @@ void AdiumEmoticons::newTheme() { - QString path = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QStringLiteral("/emoticons/") + themeName(); + QString path = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1String("/emoticons/") + themeName(); QDir().mkpath(path); QFile fp(path + QLatin1Char('/') + QStringLiteral("Emoticons.plist")); diff -Nru kemoticons-5.61.0/src/providers/adium/emoticonstheme_adium.desktop kemoticons-5.62.0/src/providers/adium/emoticonstheme_adium.desktop --- kemoticons-5.61.0/src/providers/adium/emoticonstheme_adium.desktop 2019-08-03 19:32:34.000000000 +0000 +++ kemoticons-5.62.0/src/providers/adium/emoticonstheme_adium.desktop 2019-09-07 12:34:32.000000000 +0000 @@ -68,7 +68,7 @@ Name[sr@latin]=Adiumova tema emotikona Name[sv]=Adium smilistema Name[ta]=ஏடியம் உணர்வுருக்களுக்கான தோற்றம் -Name[tg]=Мавзӯъи Adium Emoticons +Name[tg]=Мавзӯи маҷмӯаи шаклакҳо Name[th]=ภาพไอคอนสื่ออารมณ์ของ Adium Name[tr]=Adium Duygu Simgesi Teması Name[tt]=Adium көлчекләр җыелмасы @@ -147,7 +147,7 @@ Comment[sr@latin]=Biblioteka za Adiumovu temu emotikona Comment[sv]=Bibliotek för att använda Adium smilistema Comment[ta]=ஏடியம் உணர்வுரு தோற்றத்திற்கான நிரலகம் -Comment[tg]=Китобхонаи мавзӯъи Adium emoticons +Comment[tg]=Китобхона барои истифодаи мавзӯи маҷмӯаи шаклакҳо Comment[th]=ไลบรารีที่ใช้ภาพไอคอนสื่ออารมณ์ของ Adium Comment[tr]=Adium Duygu Simgesi Temasını kullanmak için kitaplık Comment[tt]=Adium көлчек җыелмасы өчен китапханә diff -Nru kemoticons-5.61.0/src/providers/kde/emoticonstheme_kde.desktop kemoticons-5.62.0/src/providers/kde/emoticonstheme_kde.desktop --- kemoticons-5.61.0/src/providers/kde/emoticonstheme_kde.desktop 2019-08-03 19:32:34.000000000 +0000 +++ kemoticons-5.62.0/src/providers/kde/emoticonstheme_kde.desktop 2019-09-07 12:34:32.000000000 +0000 @@ -57,7 +57,7 @@ Name[sr@latin]=KDE‑ova tema emotikona Name[sv]=KDE smilistema Name[ta]=கேடியீ உணர்வுருக்கள் தோற்றம் -Name[tg]=Мавзӯъи KDE Emoticons +Name[tg]=Мавзӯи шаклакҳои KDE Name[th]=ภาพไอคอนสื่ออารมณ์ของ KDE Name[tr]=Kde Duygu Simgesi Teması Name[tt]=KDE көлчекләр җыелмасы @@ -137,7 +137,7 @@ Comment[sr@latin]=Biblioteka za KDE‑ovu temu emotikona Comment[sv]=Bibliotek för att använda KDE smilistema Comment[ta]=நிரலகம் கேடியி உணர்வுரு தோற்றத்தை பயன்படுத்தும் -Comment[tg]=Китобхонаи мавзӯъи KDE emoticons +Comment[tg]=Китобхона барои истифодаи мавзӯи шаклакҳои KDE Comment[th]=ไลบรารีที่ใช้ภาพไอคอนสื่ออารมณ์ของ KDE Comment[tr]=Kde Duygu Simgesi Temasını kullanmak için kitaplık Comment[tt]=KDE көлчек җыелмасы өчен китапханә diff -Nru kemoticons-5.61.0/src/providers/kde/kde_emoticons.cpp kemoticons-5.62.0/src/providers/kde/kde_emoticons.cpp --- kemoticons-5.61.0/src/providers/kde/kde_emoticons.cpp 2019-08-03 19:32:34.000000000 +0000 +++ kemoticons-5.62.0/src/providers/kde/kde_emoticons.cpp 2019-09-07 12:34:32.000000000 +0000 @@ -161,13 +161,13 @@ } } - QString emo = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("emoticons/") + themeName() + QLatin1Char('/') + de.attribute(QStringLiteral("file"))); + QString emo = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QLatin1String("emoticons/") + themeName() + QLatin1Char('/') + de.attribute(QLatin1String("file"))); if (emo.isEmpty()) { QList ext = QImageReader::supportedImageFormats(); for (int j = 0; j < ext.size(); ++j) { - emo = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("emoticons/") + + emo = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QLatin1String("emoticons/") + themeName() + QLatin1Char('/') + de.attribute(QStringLiteral("file")) + QLatin1Char('.') + QString::fromLatin1(ext.at(j))); if (!emo.isEmpty()) { @@ -190,7 +190,7 @@ void KdeEmoticons::newTheme() { - const QString path = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QStringLiteral("/emoticons/") + themeName(); + const QString path = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1String("/emoticons/") + themeName(); QDir().mkpath(path); QFile fp(path + QLatin1Char('/') + QStringLiteral("emoticons.xml")); diff -Nru kemoticons-5.61.0/src/providers/pidgin/emoticonstheme_pidgin.desktop kemoticons-5.62.0/src/providers/pidgin/emoticonstheme_pidgin.desktop --- kemoticons-5.61.0/src/providers/pidgin/emoticonstheme_pidgin.desktop 2019-08-03 19:32:34.000000000 +0000 +++ kemoticons-5.62.0/src/providers/pidgin/emoticonstheme_pidgin.desktop 2019-09-07 12:34:32.000000000 +0000 @@ -70,7 +70,7 @@ Name[sr@latin]=Pidginova tema emotikona Name[sv]=Pidgin smilistema Name[ta]=பிட்கின் உணர்வுருக்கள் தோற்றம் -Name[tg]=Мавзӯъи Pidgin Emoticons +Name[tg]=Мавзӯи шаклакҳои Pidgin Name[th]=ภาพไอคอนสื่ออารมณ์ของ Pidgin Name[tr]=Pidgin Duygu Simgesi Teması Name[tt]=Pidgin көлчекләр җыелмасы @@ -150,7 +150,7 @@ Comment[sr@latin]=Biblioteka za Pidginovu temu emotikona Comment[sv]=Bibliotek för att använda Pidgin smilistema Comment[ta]=நிரலகம் பிட்கின் உணர்வுரு தோற்றத்தை பயன்படுத்தும் -Comment[tg]=Китобхонаи мавзӯъи Pidgin emoticons +Comment[tg]=Китобхона барои истифодаи мавзӯи шаклакҳои Pidgin Comment[th]=ไลบรารีที่ใช้ภาพไอคอนสื่ออารมณ์ของ Pidgin Comment[tr]=Pidgin Duygu Simgesi Temasını kullanmak için kitaplık Comment[tt]=Pidgin көлчек җыелмасы өчен китапханә diff -Nru kemoticons-5.61.0/src/providers/pidgin/pidgin_emoticons.cpp kemoticons-5.62.0/src/providers/pidgin/pidgin_emoticons.cpp --- kemoticons-5.61.0/src/providers/pidgin/pidgin_emoticons.cpp 2019-08-03 19:32:34.000000000 +0000 +++ kemoticons-5.62.0/src/providers/pidgin/pidgin_emoticons.cpp 2019-09-07 12:34:32.000000000 +0000 @@ -65,7 +65,7 @@ const QStringList splitted = line.split(QLatin1Char(' ')); QString emoName; - if (splitted.at(0) == QLatin1String("!")) { + if (splitted.at(0) == QLatin1Char('!')) { emoName = splitted.at(1); } else { emoName = splitted.at(0); @@ -129,7 +129,7 @@ m_text.insert(i + 1, QStringLiteral("Icon=") + file); } - emoStream << m_text.join(QStringLiteral("\n")); + emoStream << m_text.join(QLatin1Char('\n')); fp.close(); } @@ -177,13 +177,13 @@ QStringList splitted = line.split(QRegExp(QStringLiteral("\\s+"))); QString emo; int i = 1; - if (splitted.at(0) == QLatin1String("!")) { + if (splitted.at(0) == QLatin1Char('!')) { i = 2; emo = splitted.at(1); } else { emo = splitted.at(0); } - emo = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("emoticons/") + themeName() + QLatin1Char('/') + emo); + emo = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QLatin1String("emoticons/") + themeName() + QLatin1Char('/') + emo); QStringList sl; for (; i < splitted.size(); ++i) { @@ -203,7 +203,7 @@ void PidginEmoticons::newTheme() { - QString path = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QStringLiteral("/emoticons/") + themeName(); + QString path = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1String("/emoticons/") + themeName(); QDir().mkpath(path); QFile fp(path + QLatin1Char('/') + QStringLiteral("theme")); diff -Nru kemoticons-5.61.0/src/providers/xmpp/emoticonstheme_xmpp.desktop kemoticons-5.62.0/src/providers/xmpp/emoticonstheme_xmpp.desktop --- kemoticons-5.61.0/src/providers/xmpp/emoticonstheme_xmpp.desktop 2019-08-03 19:32:34.000000000 +0000 +++ kemoticons-5.62.0/src/providers/xmpp/emoticonstheme_xmpp.desktop 2019-09-07 12:34:32.000000000 +0000 @@ -69,7 +69,7 @@ Name[sr@latin]=XMPP tema emotikona Name[sv]=XMPP smilistema Name[ta]=XMPP உணர்வுருக்கள் தோற்றம் -Name[tg]=Мавзӯъи XMPP Emoticons +Name[tg]=Мавзӯи шаклакҳои XMPP Name[th]=ภาพไอคอนสื่ออารมณ์ของ XMPP Name[tr]=XMPP Duygu Simgesi Teması Name[tt]=XMPP көлчекләр җыелмасы @@ -149,7 +149,7 @@ Comment[sr@latin]=Biblioteka za XMPP temu emotikona Comment[sv]=Bibliotek för att använda XMPP smilistema Comment[ta]=நிரலகம் XMPP உணர்வுரு தோற்றத்தை பயன்படுத்தும் -Comment[tg]=Китобхонаи мавзӯъи XMPP emoticons +Comment[tg]=Китобхона барои истифодаи мавзӯи шаклакҳои XMPP Comment[th]=ไลบรารีที่ใช้ภาพไอคอนสื่ออารมณ์ของ XMPP Comment[tr]=XMPP Duygu Simgesi Temasını kullanmak için kitaplık Comment[tt]=XMPP көлчек җыелмасы өчен китапханә diff -Nru kemoticons-5.61.0/src/providers/xmpp/xmpp_emoticons.cpp kemoticons-5.62.0/src/providers/xmpp/xmpp_emoticons.cpp --- kemoticons-5.61.0/src/providers/xmpp/xmpp_emoticons.cpp 2019-08-03 19:32:34.000000000 +0000 +++ kemoticons-5.62.0/src/providers/xmpp/xmpp_emoticons.cpp 2019-09-07 12:34:32.000000000 +0000 @@ -183,7 +183,7 @@ } } - emo = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("emoticons/") + themeName() + QLatin1Char('/') + emo); + emo = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QLatin1String("emoticons/") + themeName() + QLatin1Char('/') + emo); if (emo.isEmpty()) { continue; @@ -199,7 +199,7 @@ void XmppEmoticons::newTheme() { - const QString path = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QStringLiteral("/emoticons/") + themeName(); + const QString path = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1String("/emoticons/") + themeName(); QDir().mkpath(path); QFile fp(path + QLatin1Char('/') + QStringLiteral("icondef.xml"));