Hello community, here is the log from the commit of package kemoticons for openSUSE:Factory checked in at 2016-01-20 09:44:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kemoticons (Old) and /work/SRC/openSUSE:Factory/.kemoticons.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kemoticons" Changes: -------- --- /work/SRC/openSUSE:Factory/kemoticons/kemoticons.changes 2015-12-29 12:52:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kemoticons.new/kemoticons.changes 2016-01-20 09:44:02.000000000 +0100 @@ -1,0 +2,7 @@ +Sat Jan 2 17:43:02 UTC 2016 - [email protected] + +- Update to 5.18.0 + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.18.0.php + +------------------------------------------------------------------- Old: ---- kemoticons-5.17.0.tar.xz New: ---- kemoticons-5.18.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kemoticons.spec ++++++ --- /var/tmp/diff_new_pack.nDbljn/_old 2016-01-20 09:44:03.000000000 +0100 +++ /var/tmp/diff_new_pack.nDbljn/_new 2016-01-20 09:44:03.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package kemoticons # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,9 +17,9 @@ %define lname libKF5Emoticons5 -%define _tar_path 5.17 +%define _tar_path 5.18 Name: kemoticons -Version: 5.17.0 +Version: 5.18.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 ++++++ kemoticons-5.17.0.tar.xz -> kemoticons-5.18.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.17.0/CMakeLists.txt new/kemoticons-5.18.0/CMakeLists.txt --- old/kemoticons-5.17.0/CMakeLists.txt 2015-12-06 15:04:05.000000000 +0100 +++ new/kemoticons-5.18.0/CMakeLists.txt 2016-01-01 20:55:29.000000000 +0100 @@ -3,7 +3,7 @@ project(KEmoticons) include(FeatureSummary) -find_package(ECM 5.17.0 NO_MODULE) +find_package(ECM 5.18.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) @@ -23,8 +23,8 @@ include(ECMGenerateHeaders) include(ECMPackageConfigHelpers) -set(KF5_VERSION "5.17.0") # handled by release scripts -set(KF5_DEP_VERSION "5.17.0") # handled by release scripts +set(KF5_VERSION "5.18.0") # handled by release scripts +set(KF5_DEP_VERSION "5.18.0") # handled by release scripts ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KEMOTICONS VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kemoticons_version.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.17.0/autotests/kemoticontest.cpp new/kemoticons-5.18.0/autotests/kemoticontest.cpp --- old/kemoticons-5.17.0/autotests/kemoticontest.cpp 2015-12-06 15:04:05.000000000 +0100 +++ new/kemoticons-5.18.0/autotests/kemoticontest.cpp 2016-01-01 20:55:29.000000000 +0100 @@ -51,7 +51,7 @@ } QDir themeDir(baseThemeDir.absolutePath() + '/' + themeName); themeDir.removeRecursively(); - themeDir.mkpath("."); + themeDir.mkpath(QStringLiteral(".")); foreach (const QString &fileName, sourceThemeDir.entryList(QDir::Files)) { if (!QFile::copy(sourceThemeDir.filePath(fileName), @@ -74,19 +74,19 @@ if (themeDir.exists()) { QVERIFY(themeDir.removeRecursively()); } - QVERIFY(themeDir.mkpath(".")); + QVERIFY(themeDir.mkpath(QStringLiteral("."))); QVERIFY(copyTheme(QFile::decodeName(LOCAL_THEMES_DIR) + QLatin1String("/") + default_theme, themeDir, default_theme)); // check it can actually be found themePath = QStandardPaths::locate( QStandardPaths::GenericDataLocation, - QString::fromLatin1("emoticons/"), + QStringLiteral("emoticons/"), QStandardPaths::LocateDirectory); QVERIFY2(!themePath.isEmpty(), qPrintable(themePath)); // also copy the xmpp theme - QVERIFY(copyTheme(QFINDTESTDATA("xmpp-testtheme"), themeDir, "xmpp-testtheme")); + QVERIFY(copyTheme(QFINDTESTDATA("xmpp-testtheme"), themeDir, QStringLiteral("xmpp-testtheme"))); } void cleanupTestCase() @@ -108,14 +108,14 @@ QVERIFY(!basePath.isEmpty()); QDir testCasesDir(basePath); - QStringList inputFileNames = testCasesDir.entryList(QStringList(QLatin1String("*.input"))); + QStringList inputFileNames = testCasesDir.entryList(QStringList(QStringLiteral("*.input"))); Q_FOREACH (const QString &fileName, inputFileNames) { QString outputFileName = fileName; - outputFileName.replace("input", "output"); - const QString baseName = fileName.section("-", 0, 0); + outputFileName.replace(QStringLiteral("input"), QStringLiteral("output")); + const QString baseName = fileName.section(QLatin1Char('-'), 0, 0); QTest::newRow(qPrintable(fileName.left(fileName.lastIndexOf('.')))) - << basePath + QString::fromLatin1("/") + fileName - << basePath + QString::fromLatin1("/") + outputFileName + << basePath + QLatin1Char('/') + fileName + << basePath + QLatin1Char('/') + outputFileName << (baseName == QLatin1String("xmpp") ? "xmpp-testtheme" : default_theme) << (baseName == QLatin1String("broken")); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.17.0/autotests/ktexttohtmlplugintest.cpp new/kemoticons-5.18.0/autotests/ktexttohtmlplugintest.cpp --- old/kemoticons-5.17.0/autotests/ktexttohtmlplugintest.cpp 2015-12-06 15:04:05.000000000 +0100 +++ new/kemoticons-5.18.0/autotests/ktexttohtmlplugintest.cpp 2016-01-01 20:55:29.000000000 +0100 @@ -44,17 +44,17 @@ void KTextToHTMLPluginTest::initTestCase() { - KEmoticons::setTheme("Glass"); - mEmoticonsThemePath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, "emoticons/Glass", QStandardPaths::LocateDirectory); + KEmoticons::setTheme(QStringLiteral("Glass")); + mEmoticonsThemePath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("emoticons/Glass"), QStandardPaths::LocateDirectory); QVERIFY(!mEmoticonsThemePath.isEmpty()); } QString KTextToHTMLPluginTest::htmlForSmiley(const QString &emoticon, const QString &name) const { return QString("<img align=\"center\" title=\"%1\" alt=\"%1\" src=\"%2/%3.png\" width=\"22\" height=\"22\" />") - .arg(emoticon) - .arg(mEmoticonsThemePath) - .arg(name); + .arg(emoticon, + mEmoticonsThemePath, + name); } @@ -69,22 +69,22 @@ QTest::newRow("simple") << "Hello :-)" << false << QStringList() - << QString("Hello %1").arg(htmlForSmiley(":-)", "smile")); + << QString("Hello %1").arg(htmlForSmiley(QStringLiteral(":-)"), QStringLiteral("smile"))); QTest::newRow("between strings") << "Hello :-) How are you?" << false << QStringList() - << QString("Hello %1 How are you?").arg(htmlForSmiley(":-)", "smile")); + << QString("Hello %1 How are you?").arg(htmlForSmiley(QStringLiteral(":-)"), QStringLiteral("smile"))); QTest::newRow("excluded") << "Bye :-(" - << false << (QStringList() << ":-(") + << false << (QStringList() << QStringLiteral(":-(")) << "Bye :-("; QTest::newRow("don't mix in HTML") << "<b>:(</b>" << false << QStringList() - << QString("<b>%1</b>").arg(htmlForSmiley(":(", "sad")); + << QString("<b>%1</b>").arg(htmlForSmiley(QStringLiteral(":("), QStringLiteral("sad"))); QTest::newRow("strict parsing of smileys without space") << "Very happy! :-):-)" @@ -94,7 +94,7 @@ QTest::newRow("nonstrict parsing of smileys without space") << "Very happy! :-):-)" << false << QStringList() - << QString("Very happy! %1%1").arg(htmlForSmiley(":-)", "smile")); + << QString("Very happy! %1%1").arg(htmlForSmiley(QStringLiteral(":-)"), QStringLiteral("smile"))); QTest::newRow("smiley in HTML") << "<img src=\"...\" title=\":-)\" />" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.17.0/src/core/kemoticons.cpp new/kemoticons-5.18.0/src/core/kemoticons.cpp --- old/kemoticons-5.17.0/src/core/kemoticons.cpp 2015-12-06 15:04:05.000000000 +0100 +++ new/kemoticons-5.18.0/src/core/kemoticons.cpp 2016-01-01 20:55:29.000000000 +0100 @@ -62,13 +62,13 @@ bool priorityLessThan(const KService::Ptr &s1, const KService::Ptr &s2) { - return (s1->property("X-KDE-Priority").toInt() > s2->property("X-KDE-Priority").toInt()); + return (s1->property(QStringLiteral("X-KDE-Priority")).toInt() > s2->property(QStringLiteral("X-KDE-Priority")).toInt()); } void KEmoticonsPrivate::loadServiceList() { QString constraint("(exist Library)"); - m_loaded = KServiceTypeTrader::self()->query("KEmoticons", constraint); + m_loaded = KServiceTypeTrader::self()->query(QStringLiteral("KEmoticons"), constraint); qSort(m_loaded.begin(), m_loaded.end(), priorityLessThan); } @@ -97,7 +97,7 @@ { const int numberOfTheme = m_loaded.size(); for (int i = 0; i < numberOfTheme; ++i) { - const QString fName = m_loaded.at(i)->property("X-KDE-EmoticonsFileName").toString(); + const QString fName = m_loaded.at(i)->property(QStringLiteral("X-KDE-EmoticonsFileName")).toString(); const QString path = QStandardPaths::locate(QStandardPaths::GenericDataLocation, "emoticons/" + name + '/' + fName); if (QFile::exists(path)) { @@ -139,7 +139,7 @@ QString KEmoticons::currentThemeName() { - KConfigGroup config(KSharedConfig::openConfig("kdeglobals"), "Emoticons"); + KConfigGroup config(KSharedConfig::openConfig(QStringLiteral("kdeglobals")), "Emoticons"); QString name = config.readEntry("emoticonsTheme", "Breeze"); return name; } @@ -147,7 +147,7 @@ QStringList KEmoticons::themeList() { QStringList ls; - const QStringList themeDirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "emoticons", QStandardPaths::LocateDirectory); + const QStringList themeDirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("emoticons"), QStandardPaths::LocateDirectory); for (int i = 0; i < themeDirs.count(); ++i) { QDir themeQDir(themeDirs[i]); @@ -165,7 +165,7 @@ void KEmoticons::setTheme(const QString &theme) { - KConfigGroup config(KSharedConfig::openConfig("kdeglobals"), "Emoticons"); + KConfigGroup config(KSharedConfig::openConfig(QStringLiteral("kdeglobals")), "Emoticons"); config.writeEntry("emoticonsTheme", theme); config.sync(); } @@ -198,18 +198,18 @@ QMimeDatabase db; const QString currentBundleMimeType = db.mimeTypeForFile(archiveName).name(); - if (currentBundleMimeType == "application/zip" || - currentBundleMimeType == "application/x-zip" || - currentBundleMimeType == "application/x-zip-compressed") { + if (currentBundleMimeType == QLatin1String("application/zip") || + currentBundleMimeType == QLatin1String("application/x-zip") || + currentBundleMimeType == QLatin1String("application/x-zip-compressed")) { archive = new KZip(archiveName); - } else if (currentBundleMimeType == "application/x-compressed-tar" || - currentBundleMimeType == "application/x-bzip-compressed-tar" || - currentBundleMimeType == "application/x-lzma-compressed-tar" || - currentBundleMimeType == "application/x-xz-compressed-tar" || - currentBundleMimeType == "application/x-gzip" || - currentBundleMimeType == "application/x-bzip" || - currentBundleMimeType == "application/x-lzma" || - currentBundleMimeType == "application/x-xz") { + } else if (currentBundleMimeType == QLatin1String("application/x-compressed-tar") || + currentBundleMimeType == QLatin1String("application/x-bzip-compressed-tar") || + currentBundleMimeType == QLatin1String("application/x-lzma-compressed-tar") || + currentBundleMimeType == QLatin1String("application/x-xz-compressed-tar") || + currentBundleMimeType == QLatin1String("application/x-gzip") || + currentBundleMimeType == QLatin1String("application/x-bzip") || + currentBundleMimeType == QLatin1String("application/x-lzma") || + currentBundleMimeType == QLatin1String("application/x-xz")) { archive = new KTar(archiveName); } else if (archiveName.endsWith(QLatin1String("jisp")) || archiveName.endsWith(QLatin1String("zip"))) { archive = new KZip(archiveName); @@ -234,7 +234,7 @@ currentDir = dynamic_cast<KArchiveDirectory *>(currentEntry); for (int i = 0; i < d->m_loaded.size(); ++i) { - QString fName = d->m_loaded.at(i)->property("X-KDE-EmoticonsFileName").toString(); + QString fName = d->m_loaded.at(i)->property(QStringLiteral("X-KDE-EmoticonsFileName")).toString(); if (currentDir && currentDir->entry(fName) != NULL) { foundThemes.append(currentDir->name()); @@ -279,14 +279,14 @@ void KEmoticons::setParseMode(KEmoticonsTheme::ParseMode mode) { - KConfigGroup config(KSharedConfig::openConfig("kdeglobals"), "Emoticons"); + KConfigGroup config(KSharedConfig::openConfig(QStringLiteral("kdeglobals")), "Emoticons"); config.writeEntry("parseMode", int(mode)); config.sync(); } KEmoticonsTheme::ParseMode KEmoticons::parseMode() { - KConfigGroup config(KSharedConfig::openConfig("kdeglobals"), "Emoticons"); + KConfigGroup config(KSharedConfig::openConfig(QStringLiteral("kdeglobals")), "Emoticons"); return (KEmoticonsTheme::ParseMode) config.readEntry("parseMode", int(KEmoticonsTheme::RelaxedParse)); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.17.0/src/providers/adium/adium_emoticons.cpp new/kemoticons-5.18.0/src/providers/adium/adium_emoticons.cpp --- old/kemoticons-5.17.0/src/providers/adium/adium_emoticons.cpp 2015-12-06 15:04:05.000000000 +0100 +++ new/kemoticons-5.18.0/src/providers/adium/adium_emoticons.cpp 2016-01-01 20:55:29.000000000 +0100 @@ -37,7 +37,7 @@ bool AdiumEmoticons::removeEmoticon(const QString &emo) { QString emoticon = QFileInfo(emoticonsMap().key(emo.split(' '))).fileName(); - QDomElement fce = m_themeXml.firstChildElement("plist").firstChildElement("dict").firstChildElement("dict"); + QDomElement fce = m_themeXml.firstChildElement(QStringLiteral("plist")).firstChildElement(QStringLiteral("dict")).firstChildElement(QStringLiteral("dict")); if (fce.isNull()) { return false; @@ -46,9 +46,9 @@ QDomNodeList nl = fce.childNodes(); for (int i = 0; i < nl.length(); i++) { QDomElement de = nl.item(i).toElement(); - if (!de.isNull() && de.tagName() == "key" && (de.text() == emoticon)) { + if (!de.isNull() && de.tagName() == QLatin1String("key") && (de.text() == emoticon)) { QDomElement dict = de.nextSiblingElement(); - if (!dict.isNull() && dict.tagName() == "dict") { + if (!dict.isNull() && dict.tagName() == QLatin1String("dict")) { fce.removeChild(dict); } @@ -72,26 +72,26 @@ } const QStringList splitted = text.split(' '); - QDomElement fce = m_themeXml.firstChildElement("plist").firstChildElement("dict").firstChildElement("dict"); + QDomElement fce = m_themeXml.firstChildElement(QStringLiteral("plist")).firstChildElement(QStringLiteral("dict")).firstChildElement(QStringLiteral("dict")); if (fce.isNull()) { return false; } - QDomElement emoticon = m_themeXml.createElement("key"); + QDomElement emoticon = m_themeXml.createElement(QStringLiteral("key")); emoticon.appendChild(m_themeXml.createTextNode(QFileInfo(emo).fileName())); fce.appendChild(emoticon); - QDomElement dict = m_themeXml.createElement("dict"); - QDomElement el = m_themeXml.createElement("key"); - el.appendChild(m_themeXml.createTextNode("Equivalents")); + QDomElement dict = m_themeXml.createElement(QStringLiteral("dict")); + QDomElement el = m_themeXml.createElement(QStringLiteral("key")); + el.appendChild(m_themeXml.createTextNode(QStringLiteral("Equivalents"))); dict.appendChild(el); - QDomElement arr = m_themeXml.createElement("array"); + QDomElement arr = m_themeXml.createElement(QStringLiteral("array")); QStringList::const_iterator constIterator; for (constIterator = splitted.begin(); constIterator != splitted.end(); ++constIterator) { - QDomElement emoText = m_themeXml.createElement("string"); + QDomElement emoText = m_themeXml.createElement(QStringLiteral("string")); QDomText txt = m_themeXml.createTextNode((*constIterator).trimmed()); emoText.appendChild(txt); arr.appendChild(emoText); @@ -99,11 +99,11 @@ dict.appendChild(arr); - el = m_themeXml.createElement("key"); - el.appendChild(m_themeXml.createTextNode("Name")); + el = m_themeXml.createElement(QStringLiteral("key")); + el.appendChild(m_themeXml.createTextNode(QStringLiteral("Name"))); dict.appendChild(el); - el = m_themeXml.createElement("string"); + el = m_themeXml.createElement(QStringLiteral("string")); el.appendChild(m_themeXml.createTextNode(QFileInfo(emo).baseName())); dict.appendChild(el); @@ -160,7 +160,7 @@ file.close(); - QDomElement fce = m_themeXml.firstChildElement("plist").firstChildElement("dict").firstChildElement("dict"); + QDomElement fce = m_themeXml.firstChildElement(QStringLiteral("plist")).firstChildElement(QStringLiteral("dict")).firstChildElement(QStringLiteral("dict")); if (fce.isNull()) { return false; @@ -173,18 +173,18 @@ for (int i = 0; i < nl.length(); i++) { QDomElement de = nl.item(i).toElement(); - if (!de.isNull() && de.tagName() == "key") { + if (!de.isNull() && de.tagName() == QLatin1String("key")) { name = QStandardPaths::locate(QStandardPaths::GenericDataLocation, "emoticons/" + themeName() + '/' + de.text()); continue; - } else if (!de.isNull() && de.tagName() == "dict") { - QDomElement arr = de.firstChildElement("array"); + } else if (!de.isNull() && de.tagName() == QLatin1String("dict")) { + QDomElement arr = de.firstChildElement(QStringLiteral("array")); QDomNodeList snl = arr.childNodes(); QStringList sl; for (int k = 0; k < snl.length(); k++) { QDomElement sde = snl.item(k).toElement(); - if (!sde.isNull() && sde.tagName() == "string") { + if (!sde.isNull() && sde.tagName() == QLatin1String("string")) { sl << sde.text(); } } @@ -211,30 +211,30 @@ return; } - QDomDocumentType ty = QDomImplementation().createDocumentType("plist", "-//Apple Computer//DTD PLIST 1.0//EN", "http://www.apple.com/DTDs/PropertyList-1.0.dtd";); + QDomDocumentType ty = QDomImplementation().createDocumentType(QStringLiteral("plist"), QStringLiteral("-//Apple Computer//DTD PLIST 1.0//EN"), QStringLiteral("http://www.apple.com/DTDs/PropertyList-1.0.dtd";)); QDomDocument doc(ty); - doc.appendChild(doc.createProcessingInstruction("xml", "version=\"1.0\" encoding=\"UTF-8\"")); + doc.appendChild(doc.createProcessingInstruction(QStringLiteral("xml"), QStringLiteral("version=\"1.0\" encoding=\"UTF-8\""))); - QDomElement plist = doc.createElement("plist"); - plist.setAttribute("version", "1.0"); + QDomElement plist = doc.createElement(QStringLiteral("plist")); + plist.setAttribute(QStringLiteral("version"), QStringLiteral("1.0")); doc.appendChild(plist); - QDomElement dict = doc.createElement("dict"); + QDomElement dict = doc.createElement(QStringLiteral("dict")); plist.appendChild(dict); - QDomElement el = doc.createElement("key"); - el.appendChild(doc.createTextNode("AdiumSetVersion")); + QDomElement el = doc.createElement(QStringLiteral("key")); + el.appendChild(doc.createTextNode(QStringLiteral("AdiumSetVersion"))); dict.appendChild(el); - el = doc.createElement("integer"); - el.appendChild(doc.createTextNode("1")); + el = doc.createElement(QStringLiteral("integer")); + el.appendChild(doc.createTextNode(QStringLiteral("1"))); dict.appendChild(el); - el = doc.createElement("key"); - el.appendChild(doc.createTextNode("Emoticons")); + el = doc.createElement(QStringLiteral("key")); + el.appendChild(doc.createTextNode(QStringLiteral("Emoticons"))); dict.appendChild(el); - dict.appendChild(doc.createElement("dict")); + dict.appendChild(doc.createElement(QStringLiteral("dict"))); QTextStream emoStream(&fp); emoStream.setCodec("UTF-8"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.17.0/src/providers/adium/emoticonstheme_adium.desktop new/kemoticons-5.18.0/src/providers/adium/emoticonstheme_adium.desktop --- old/kemoticons-5.17.0/src/providers/adium/emoticonstheme_adium.desktop 2015-12-06 15:04:05.000000000 +0100 +++ new/kemoticons-5.18.0/src/providers/adium/emoticonstheme_adium.desktop 2016-01-01 20:55:29.000000000 +0100 @@ -44,7 +44,7 @@ Name[kn]=ಏಡಿಯಮ್ ಭಾವನಾಚಿಹ್ನೆಗಳ (ಎಮೋಟಿಕಾನ್) ಪರಿಸರವಿನ್ಯಾಸ (ಥೀಮ್) Name[ko]=Adium 이모티콘 테마 Name[ku]=Dirba Vegotinan yê Adium -Name[lt]=Adium jaustukų tema +Name[lt]=Adium jaustukų apipavidalinimas Name[lv]=Adium emocijzīmju tēma Name[mai]=एडियम भावचिन्ह प्रसंग Name[ml]=അഡിയം ഇമോട്ടിക്കോണ് രംഗവിതാനം @@ -124,7 +124,7 @@ Comment[kn]=ಏಡಿಯಮ್ ಭಾವನಾಚಿಹ್ನೆಗಳ (ಎಮೋಟಿಕಾನ್) ಪರಿಸರವಿನ್ಯಾಸವನ್ನು (ಥೀಮ್) ಬಳಸಲು ಒಂದು ಭಂಡಾರ (ಲೈಬ್ರರಿ) Comment[ko]=Adium 이모티콘 테마를 사용할 라이브러리 Comment[ku]=Pirtûkxane ji bo bi kar anîna Dirba Vegotinan yê Adium -Comment[lt]=Biblioteka, leidžianti naudoti adium jaustukų temą +Comment[lt]=Biblioteka, leidžianti naudoti adium jaustukų apipavidalinimą Comment[lv]=Adium emocijzīmju tēmas bibliotēka Comment[mai]=एडियम भावचिन्ह प्रसंगक प्रयोगक लेल लाइब्रेरी Comment[ml]=അഡിയം ഇമോട്ടിക്കോണ് രംഗവിതാനം ഉപയോഗിയ്ക്കേണ്ട ലൈബ്രറി diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.17.0/src/providers/kde/emoticonstheme_kde.desktop new/kemoticons-5.18.0/src/providers/kde/emoticonstheme_kde.desktop --- old/kemoticons-5.17.0/src/providers/kde/emoticonstheme_kde.desktop 2015-12-06 15:04:05.000000000 +0100 +++ new/kemoticons-5.18.0/src/providers/kde/emoticonstheme_kde.desktop 2016-01-01 20:55:29.000000000 +0100 @@ -35,7 +35,7 @@ Name[km]=ស្បែកសញ្ញាអារម្មណ៍របស់ KDE Name[ko]=KDE 이모티콘 테마 Name[ku]=Dirba Vegotinan yên Kde -Name[lt]=KDE jaustukų tema +Name[lt]=KDE jaustukų apipavidalinimas Name[lv]=KDE emocijzīmju tēma Name[mr]=केडीई भावप्रतिमा शैली Name[nb]=KDE smilefjestema @@ -113,7 +113,7 @@ Comment[kn]=ಕೆಡಿಇ ಭಾವನಾಚಿಹ್ನೆಗಳ (ಎಮೋಟಿಕಾನ್) ಪರಿಸರವಿನ್ಯಾಸವನ್ನು (ಥೀಮ್) ಬಳಸಲು ಒಂದು ಭಂಡಾರ (ಲೈಬ್ರರಿ) Comment[ko]=KDE 이모티콘 테마를 사용할 라이브러리 Comment[ku]=Pirtûkxane ji bo bi kar anîna Dirba Vegotinan yê KDE -Comment[lt]=Biblioteka, leidžianti naudoti kde jaustukų temą +Comment[lt]=Biblioteka, leidžianti naudoti kde jaustukų apipavidalinimą Comment[lv]=KDE emocijzīmju tēmas bibliotēka Comment[mai]=केडीई भावचिन्ह प्रसंगक प्रयोगक लेल लाइब्रेरी Comment[ml]=കെഡിഇ ഇമോട്ടിക്കോണ് രംഗവിതാനം ഉപയോഗിയ്ക്കേണ്ട ലൈബ്രറി diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.17.0/src/providers/kde/kde_emoticons.cpp new/kemoticons-5.18.0/src/providers/kde/kde_emoticons.cpp --- old/kemoticons-5.17.0/src/providers/kde/kde_emoticons.cpp 2015-12-06 15:04:05.000000000 +0100 +++ new/kemoticons-5.18.0/src/providers/kde/kde_emoticons.cpp 2016-01-01 20:55:29.000000000 +0100 @@ -38,7 +38,7 @@ bool KdeEmoticons::removeEmoticon(const QString &emo) { QString emoticon = QFileInfo(emoticonsMap().key(emo.split(' '))).fileName(); - QDomElement fce = m_themeXml.firstChildElement("messaging-emoticon-map"); + QDomElement fce = m_themeXml.firstChildElement(QStringLiteral("messaging-emoticon-map")); if (fce.isNull()) { return false; @@ -47,7 +47,7 @@ QDomNodeList nl = fce.childNodes(); for (int i = 0; i < nl.length(); i++) { QDomElement de = nl.item(i).toElement(); - if (!de.isNull() && de.tagName() == "emoticon" && (de.attribute("file") == emoticon || de.attribute("file") == QFileInfo(emoticon).baseName())) { + if (!de.isNull() && de.tagName() == QLatin1String("emoticon") && (de.attribute(QStringLiteral("file")) == emoticon || de.attribute(QStringLiteral("file")) == QFileInfo(emoticon).baseName())) { fce.removeChild(de); removeMapItem(emoticonsMap().key(emo.split(' '))); removeIndexItem(emoticon, emo.split(' ')); @@ -68,18 +68,18 @@ } const QStringList splitted = text.split(' '); - QDomElement fce = m_themeXml.firstChildElement("messaging-emoticon-map"); + QDomElement fce = m_themeXml.firstChildElement(QStringLiteral("messaging-emoticon-map")); if (fce.isNull()) { return false; } - QDomElement emoticon = m_themeXml.createElement("emoticon"); - emoticon.setAttribute("file", QFileInfo(emo).fileName()); + QDomElement emoticon = m_themeXml.createElement(QStringLiteral("emoticon")); + emoticon.setAttribute(QStringLiteral("file"), QFileInfo(emo).fileName()); fce.appendChild(emoticon); QStringList::const_iterator constIterator; for (constIterator = splitted.begin(); constIterator != splitted.end(); ++constIterator) { - QDomElement emoText = m_themeXml.createElement("string"); + QDomElement emoText = m_themeXml.createElement(QStringLiteral("string")); QDomText txt = m_themeXml.createTextNode((*constIterator).trimmed()); emoText.appendChild(txt); emoticon.appendChild(emoText); @@ -136,7 +136,7 @@ file.close(); - QDomElement fce = m_themeXml.firstChildElement("messaging-emoticon-map"); + QDomElement fce = m_themeXml.firstChildElement(QStringLiteral("messaging-emoticon-map")); if (fce.isNull()) { return false; @@ -149,25 +149,25 @@ for (int i = 0; i < nl.length(); i++) { QDomElement de = nl.item(i).toElement(); - if (!de.isNull() && de.tagName() == "emoticon") { + if (!de.isNull() && de.tagName() == QLatin1String("emoticon")) { QDomNodeList snl = de.childNodes(); QStringList sl; for (int k = 0; k < snl.length(); k++) { QDomElement sde = snl.item(k).toElement(); - if (!sde.isNull() && sde.tagName() == "string") { + if (!sde.isNull() && sde.tagName() == QLatin1String("string")) { sl << sde.text(); } } - QString emo = QStandardPaths::locate(QStandardPaths::GenericDataLocation, "emoticons/" + themeName() + '/' + de.attribute("file")); + QString emo = QStandardPaths::locate(QStandardPaths::GenericDataLocation, "emoticons/" + themeName() + '/' + de.attribute(QStringLiteral("file"))); if (emo.isEmpty()) { QList<QByteArray> ext = QImageReader::supportedImageFormats(); for (int j = 0; j < ext.size(); ++j) { - emo = QStandardPaths::locate(QStandardPaths::GenericDataLocation, "emoticons/" + themeName() + '/' + de.attribute("file") + '.' + ext.at(j)); + emo = QStandardPaths::locate(QStandardPaths::GenericDataLocation, "emoticons/" + themeName() + '/' + de.attribute(QStringLiteral("file")) + '.' + ext.at(j)); if (!emo.isEmpty()) { break; } @@ -199,8 +199,8 @@ } QDomDocument doc; - doc.appendChild(doc.createProcessingInstruction("xml", "version=\"1.0\"")); - doc.appendChild(doc.createElement("messaging-emoticon-map")); + doc.appendChild(doc.createProcessingInstruction(QStringLiteral("xml"), QStringLiteral("version=\"1.0\""))); + doc.appendChild(doc.createElement(QStringLiteral("messaging-emoticon-map"))); QTextStream emoStream(&fp); emoStream.setCodec("UTF-8"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.17.0/src/providers/pidgin/emoticonstheme_pidgin.desktop new/kemoticons-5.18.0/src/providers/pidgin/emoticonstheme_pidgin.desktop --- old/kemoticons-5.17.0/src/providers/pidgin/emoticonstheme_pidgin.desktop 2015-12-06 15:04:05.000000000 +0100 +++ new/kemoticons-5.18.0/src/providers/pidgin/emoticonstheme_pidgin.desktop 2016-01-01 20:55:29.000000000 +0100 @@ -45,7 +45,7 @@ Name[kn]=ಪಿಡ್ಗಿನ್ (ಎಮೋಟಿಕಾನ್ಸ್) ಪರಿಸರವಿನ್ಯಾಸ (ಥೀಮ್) Name[ko]=피진 이모티콘 테마 Name[ku]=Dirba Vegotinan yê Pidgin -Name[lt]=Pidgin jaustukų tema +Name[lt]=Pidgin jaustukų apipavidalinimas Name[lv]=Pidgin emocijzīmju tēma Name[mai]=पिजिन भावचिन्ह प्रसंग Name[ml]=പിഡ്ജിന് ഇമോട്ടിക്കോണ് രംഗവിതാനം @@ -126,7 +126,7 @@ Comment[kn]=ಪಿಡ್ಗಿನ್ ಭಾವನಾಚಿಹ್ನೆಗಳ (ಎಮೋಟಿಕಾನ್) ಪರಿಸರವಿನ್ಯಾಸವನ್ನು (ಥೀಮ್) ಬಳಸಲು ಒಂದು ಭಂಡಾರ (ಲೈಬ್ರರಿ) Comment[ko]=피진 이모티콘 테마를 사용할 라이브러리 Comment[ku]=Pirtûkxane ji bo bi kar anîna Dirba Vegotinan yê Pidgin -Comment[lt]=Biblioteka, leidžianti naudoti Pidgin jaustukų temą +Comment[lt]=Biblioteka, leidžianti naudoti Pidgin jaustukų apipavidalinimą Comment[lv]=Pidgin emocijzīmju tēmas bibliotēka Comment[mai]=पिजिन भावचिन्ह प्रसंगक प्रयोगक लेल लाइब्रेरी Comment[ml]=പിഡ്ജിന് ഇമോട്ടിക്കോണ് രംഗവിതാനം ഉപയോഗിയ്ക്കേണ്ട ലൈബ്രറി diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.17.0/src/providers/pidgin/pidgin_emoticons.cpp new/kemoticons-5.18.0/src/providers/pidgin/pidgin_emoticons.cpp --- old/kemoticons-5.17.0/src/providers/pidgin/pidgin_emoticons.cpp 2015-12-06 15:04:05.000000000 +0100 +++ new/kemoticons-5.18.0/src/providers/pidgin/pidgin_emoticons.cpp 2016-01-01 20:55:29.000000000 +0100 @@ -50,7 +50,7 @@ QRegExp re("^\\[(.*)\\]$"); int pos = re.indexIn(line.trimmed()); if (pos > -1) { - if (!re.cap(1).compare("default", Qt::CaseInsensitive)) { + if (!re.cap(1).compare(QStringLiteral("default"), Qt::CaseInsensitive)) { start = true; } else { start = false; @@ -65,7 +65,7 @@ QStringList splitted = line.split(' '); QString emoName; - if (splitted.at(0) == "!") { + if (splitted.at(0) == QLatin1String("!")) { emoName = splitted.at(1); } else { emoName = splitted.at(0); @@ -98,7 +98,8 @@ return false; } - QString emoticon = QString("%1 %2").arg(QFileInfo(emo).fileName()).arg(text); + QString emoticon = QString("%1 %2").arg(QFileInfo(emo).fileName(), + text); m_text.insert(i + 1, emoticon); addIndexItem(emo, splitted); @@ -128,7 +129,7 @@ m_text.insert(i + 1, "Icon=" + file); } - emoStream << m_text.join("\n"); + emoStream << m_text.join(QStringLiteral("\n")); fp.close(); } @@ -161,7 +162,7 @@ QRegExp re("^\\[(.*)\\]$"); int pos = re.indexIn(line.trimmed()); if (pos > -1) { - if (!re.cap(1).compare("default", Qt::CaseInsensitive)) { + if (!re.cap(1).compare(QStringLiteral("default"), Qt::CaseInsensitive)) { start = true; } else { start = false; @@ -176,7 +177,7 @@ QStringList splitted = line.split(QRegExp("\\s+")); QString emo; int i = 1; - if (splitted.at(0) == "!") { + if (splitted.at(0) == QLatin1String("!")) { i = 2; emo = splitted.at(1); } else { @@ -186,7 +187,7 @@ QStringList sl; for (; i < splitted.size(); ++i) { - if (!splitted.at(i).isEmpty() && splitted.at(i) != " ") { + if (!splitted.at(i).isEmpty() && splitted.at(i) != QLatin1String(" ")) { sl << splitted.at(i); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.17.0/src/providers/xmpp/emoticonstheme_xmpp.desktop new/kemoticons-5.18.0/src/providers/xmpp/emoticonstheme_xmpp.desktop --- old/kemoticons-5.17.0/src/providers/xmpp/emoticonstheme_xmpp.desktop 2015-12-06 15:04:05.000000000 +0100 +++ new/kemoticons-5.18.0/src/providers/xmpp/emoticonstheme_xmpp.desktop 2016-01-01 20:55:29.000000000 +0100 @@ -44,7 +44,7 @@ Name[kn]=XMPP (ಎಮೋಟಿಕಾನ್ಸ್) ಪರಿಸರವಿನ್ಯಾಸ (ಥೀಮ್) Name[ko]=XMPP 이모티콘 테마 Name[ku]=Dirba Vegotinan yê XMPP -Name[lt]=XMPP jaustukų tema +Name[lt]=XMPP jaustukų apipavidalinimas Name[lv]=XMPP emocijzīmju tēma Name[mai]=एक्सएमपीपी भावचिन्ह प्रसंग Name[ml]=എക്സ്എംപിപി ഇമോട്ടിക്കോണ് രംഗവിതാനം @@ -125,7 +125,7 @@ Comment[kn]=XMPP ಭಾವನಾಚಿಹ್ನೆಗಳ (ಎಮೋಟಿಕಾನ್) ಪರಿಸರವಿನ್ಯಾಸವನ್ನು (ಥೀಮ್) ಬಳಸಲು ಒಂದು ಭಂಡಾರ (ಲೈಬ್ರರಿ) Comment[ko]=XMPP 이모티콘 테마를 사용할 라이브러리 Comment[ku]=Pirtûkxane ji bo bi kar anîna Dirba Vegotinan yê XMPP -Comment[lt]=Biblioteka, leidžianti naudoti XMPP jaustukų temą +Comment[lt]=Biblioteka, leidžianti naudoti XMPP jaustukų apipavidalinimą Comment[lv]=XMPP emocijzīmju tēmas bibliotēka Comment[mai]=एक्सएमपीपी भावचिन्ह प्रसंगक प्रयोगक लेल लाइब्रेरी Comment[ml]=എക്സ്എംപിപി ഇമോട്ടിക്കോണ് രംഗവിതാനം ഉപയോഗിയ്ക്കേണ്ട ലൈബ്രറി diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.17.0/src/providers/xmpp/xmpp_emoticons.cpp new/kemoticons-5.18.0/src/providers/xmpp/xmpp_emoticons.cpp --- old/kemoticons-5.17.0/src/providers/xmpp/xmpp_emoticons.cpp 2015-12-06 15:04:05.000000000 +0100 +++ new/kemoticons-5.18.0/src/providers/xmpp/xmpp_emoticons.cpp 2016-01-01 20:55:29.000000000 +0100 @@ -39,7 +39,7 @@ bool XmppEmoticons::removeEmoticon(const QString &emo) { QString emoticon = QFileInfo(emoticonsMap().key(emo.split(' '))).fileName(); - QDomElement fce = m_themeXml.firstChildElement("icondef"); + QDomElement fce = m_themeXml.firstChildElement(QStringLiteral("icondef")); if (fce.isNull()) { return false; @@ -48,7 +48,7 @@ QDomNodeList nl = fce.childNodes(); for (int i = 0; i < nl.length(); i++) { QDomElement de = nl.item(i).toElement(); - if (!de.isNull() && de.tagName() == "icon") { + if (!de.isNull() && de.tagName() == QLatin1String("icon")) { QDomNodeList snl = de.childNodes(); QStringList sl; QStringList mime; @@ -56,7 +56,7 @@ for (int k = 0; k < snl.length(); k++) { QDomElement sde = snl.item(k).toElement(); - if (!sde.isNull() && sde.tagName() == "object" && sde.text() == emoticon) { + if (!sde.isNull() && sde.tagName() == QLatin1String("object") && sde.text() == emoticon) { fce.removeChild(de); removeMapItem(emoticonsMap().key(emo.split(' '))); removeIndexItem(emoticon, emo.split(' ')); @@ -79,27 +79,27 @@ } const QStringList splitted = text.split(' '); - QDomElement fce = m_themeXml.firstChildElement("icondef"); + QDomElement fce = m_themeXml.firstChildElement(QStringLiteral("icondef")); if (fce.isNull()) { return false; } - QDomElement emoticon = m_themeXml.createElement("icon"); + QDomElement emoticon = m_themeXml.createElement(QStringLiteral("icon")); fce.appendChild(emoticon); QStringList::const_iterator constIterator; for (constIterator = splitted.begin(); constIterator != splitted.end(); ++constIterator) { - QDomElement emotext = m_themeXml.createElement("text"); + QDomElement emotext = m_themeXml.createElement(QStringLiteral("text")); QDomText txt = m_themeXml.createTextNode((*constIterator).trimmed()); emotext.appendChild(txt); emoticon.appendChild(emotext); } - QDomElement emoElement = m_themeXml.createElement("object"); + QDomElement emoElement = m_themeXml.createElement(QStringLiteral("object")); QMimeDatabase db; QMimeType mime = db.mimeTypeForFile(emo, QMimeDatabase::MatchExtension); - emoElement.setAttribute("mime", mime.name()); + emoElement.setAttribute(QStringLiteral("mime"), mime.name()); QDomText txt = m_themeXml.createTextNode(QFileInfo(emo).fileName()); emoElement.appendChild(txt); @@ -156,7 +156,7 @@ file.close(); - QDomElement fce = m_themeXml.firstChildElement("icondef"); + QDomElement fce = m_themeXml.firstChildElement(QStringLiteral("icondef")); if (fce.isNull()) { return false; @@ -169,19 +169,19 @@ for (int i = 0; i < nl.length(); i++) { QDomElement de = nl.item(i).toElement(); - if (!de.isNull() && de.tagName() == "icon") { + if (!de.isNull() && de.tagName() == QLatin1String("icon")) { QDomNodeList snl = de.childNodes(); QStringList sl; QString emo; QStringList mime; - mime << "image/png" << "image/gif" << "image/bmp" << "image/jpeg"; + mime << QStringLiteral("image/png") << QStringLiteral("image/gif") << QStringLiteral("image/bmp") << QStringLiteral("image/jpeg"); for (int k = 0; k < snl.length(); k++) { QDomElement sde = snl.item(k).toElement(); - if (!sde.isNull() && sde.tagName() == "text") { + if (!sde.isNull() && sde.tagName() == QLatin1String("text")) { sl << sde.text(); - } else if (!sde.isNull() && sde.tagName() == "object" && mime.contains(sde.attribute("mime"))) { + } else if (!sde.isNull() && sde.tagName() == QLatin1String("object") && mime.contains(sde.attribute(QStringLiteral("mime")))) { emo = sde.text(); } } @@ -213,8 +213,8 @@ } QDomDocument doc; - doc.appendChild(doc.createProcessingInstruction("xml", "version=\"1.0\" encoding=\"UTF-8\"")); - doc.appendChild(doc.createElement("icondef")); + doc.appendChild(doc.createProcessingInstruction(QStringLiteral("xml"), QStringLiteral("version=\"1.0\" encoding=\"UTF-8\""))); + doc.appendChild(doc.createElement(QStringLiteral("icondef"))); QTextStream emoStream(&fp); emoStream.setCodec("UTF-8"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.17.0/tests/main.cpp new/kemoticons-5.18.0/tests/main.cpp --- old/kemoticons-5.17.0/tests/main.cpp 2015-12-06 15:04:05.000000000 +0100 +++ new/kemoticons-5.18.0/tests/main.cpp 2016-01-01 20:55:29.000000000 +0100 @@ -79,7 +79,7 @@ void KEmoTest::updateEmoticons() { QStringList excludedEmoticons; - excludedEmoticons << ":)" << ":-)"; + excludedEmoticons << QStringLiteral(":)") << QStringLiteral(":-)"); label->setText(emoticonTheme.parseEmoticons(lineEdit->text().toHtmlEscaped(), KEmoticonsTheme::DefaultParse, excludedEmoticons)); } @@ -91,7 +91,7 @@ int main(int argc, char **argv) { - QApplication::setApplicationName("kemoticonstest"); + QApplication::setApplicationName(QStringLiteral("kemoticonstest")); QApplication app(argc, argv); KEmoTest kt;
