Hello community, here is the log from the commit of package kemoticons for openSUSE:Factory checked in at 2019-01-21 10:19:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kemoticons (Old) and /work/SRC/openSUSE:Factory/.kemoticons.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kemoticons" Mon Jan 21 10:19:47 2019 rev:60 rq:665802 version:5.54.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kemoticons/kemoticons.changes 2018-12-19 13:40:54.076000276 +0100 +++ /work/SRC/openSUSE:Factory/.kemoticons.new.28833/kemoticons.changes 2019-01-21 10:19:50.742105719 +0100 @@ -1,0 +2,19 @@ +Mon Jan 14 06:08:46 UTC 2019 - [email protected] + +- Update to 5.54.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.54.0.php +- Changes since 5.53.0: + * Port to for(...:...) + * Add support for debug categories + * Add debug categories + * Minor optimization + * Use lambda here + +------------------------------------------------------------------- +Sat Dec 15 14:03:23 UTC 2018 - Jan Engelhardt <[email protected]> + +- Use noun phrase in summary. + +------------------------------------------------------------------- Old: ---- kemoticons-5.53.0.tar.xz New: ---- kemoticons-5.54.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kemoticons.spec ++++++ --- /var/tmp/diff_new_pack.2YUrwl/_old 2019-01-21 10:19:51.210105249 +0100 +++ /var/tmp/diff_new_pack.2YUrwl/_new 2019-01-21 10:19:51.214105244 +0100 @@ -1,7 +1,7 @@ # # spec file for package kemoticons # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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,15 +17,15 @@ %define lname libKF5Emoticons5 -%define _tar_path 5.53 +%define _tar_path 5.54 # 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: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} Name: kemoticons -Version: 5.53.0 +Version: 5.54.0 Release: 0 -Summary: Convert text emoticons to graphical emoticons +Summary: Emoticon to graphical emoticon text converter License: LGPL-2.1-or-later Group: System/GUI/KDE URL: https://www.kde.org @@ -49,7 +49,7 @@ from different providers. %package -n %{lname} -Summary: Convert text emoticons to graphical emoticons +Summary: Emoticon to graphical emoticon text converter Group: System/GUI/KDE Obsoletes: libKF5Emoticons4 @@ -59,7 +59,7 @@ from different providers. %package devel -Summary: Convert text emoticons to graphical emoticons +Summary: Build environment for kemoticons, an emoticon text converter Group: Development/Libraries/KDE Requires: %{lname} = %{version} Requires: extra-cmake-modules @@ -94,6 +94,7 @@ %{_kf5_servicesdir}/ %{_kf5_servicetypesdir}/ %{_kf5_sharedir}/emoticons/ +%{_kf5_debugdir}/kemoticons.categories %files devel %{_kf5_libdir}/libKF5Emoticons.so ++++++ kemoticons-5.53.0.tar.xz -> kemoticons-5.54.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.53.0/CMakeLists.txt new/kemoticons-5.54.0/CMakeLists.txt --- old/kemoticons-5.53.0/CMakeLists.txt 2018-12-01 15:39:35.000000000 +0100 +++ new/kemoticons-5.54.0/CMakeLists.txt 2019-01-04 22:42:17.000000000 +0100 @@ -1,11 +1,11 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.53.0") # handled by release scripts -set(KF5_DEP_VERSION "5.53.0") # handled by release scripts +set(KF5_VERSION "5.54.0") # handled by release scripts +set(KF5_DEP_VERSION "5.54.0") # handled by release scripts project(KEmoticons VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.53.0 NO_MODULE) +find_package(ECM 5.54.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) @@ -25,7 +25,7 @@ include(ECMGenerateHeaders) include(ECMAddQch) include(CMakePackageConfigHelpers) - +include(ECMQtDeclareLoggingCategory) option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF) add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)") @@ -46,7 +46,7 @@ # the strings throughout this library are used to search ressources # so they don't need translations - +add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000) add_subdirectory(src) add_subdirectory(themes) if (BUILD_TESTING) @@ -80,5 +80,7 @@ COMPONENT Devel ) +install( FILES kemoticons.categories DESTINATION ${KDE_INSTALL_CONFDIR} ) + feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.53.0/autotests/kemoticontest.cpp new/kemoticons-5.54.0/autotests/kemoticontest.cpp --- old/kemoticons-5.53.0/autotests/kemoticontest.cpp 2018-12-01 15:39:35.000000000 +0100 +++ new/kemoticons-5.54.0/autotests/kemoticontest.cpp 2019-01-04 22:42:17.000000000 +0100 @@ -88,8 +88,8 @@ QVERIFY(!basePath.isEmpty()); QDir testCasesDir(basePath); - QStringList inputFileNames = testCasesDir.entryList(QStringList(QStringLiteral("*.input"))); - Q_FOREACH (const QString &fileName, inputFileNames) { + const QStringList inputFileNames = testCasesDir.entryList(QStringList(QStringLiteral("*.input"))); + for (const QString &fileName : inputFileNames) { QString outputFileName = fileName; outputFileName.replace(QStringLiteral("input"), QStringLiteral("output")); const QString baseName = fileName.section(QLatin1Char('-'), 0, 0); @@ -144,8 +144,8 @@ QVERIFY(!basePath.isEmpty()); QDir testCasesDir(basePath); - QStringList inputFileNames = testCasesDir.entryList(QStringList(QStringLiteral("*.input"))); - Q_FOREACH (const QString &fileName, inputFileNames) { + const QStringList inputFileNames = testCasesDir.entryList(QStringList(QStringLiteral("*.input"))); + for (const QString &fileName : inputFileNames) { QString outputFileName = fileName; outputFileName.replace(QStringLiteral("input"), QStringLiteral("output")); const QString baseName = fileName.section(QLatin1Char('-'), 0, 0); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.53.0/kemoticons.categories new/kemoticons-5.54.0/kemoticons.categories --- old/kemoticons-5.53.0/kemoticons.categories 1970-01-01 01:00:00.000000000 +0100 +++ new/kemoticons-5.54.0/kemoticons.categories 2019-01-04 22:42:17.000000000 +0100 @@ -0,0 +1,5 @@ +kf5.kemoticons.core kemoticons core IDENTIFIER [KEMOTICONS_CORE] +kf5.kemoticons.plugin_adium kemoticons (plugin adium) IDENTIFIER [KEMOTICONS_PLUGIN_ADIUM] +kf5.kemoticons.plugin_kde kemoticons (plugin kde) IDENTIFIER [KEMOTICONS_PLUGIN_KDE] +kf5.kemoticons.plugin_pidgin kemoticons (plugin pidgin) IDENTIFIER [KEMOTICONS_PLUGIN_PIDGIN] +kf5.kemoticons.plugin_xmpp kemoticons (plugin xmpp) IDENTIFIER [KEMOTICONS_PLUGIN_XMPP] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.53.0/src/core/CMakeLists.txt new/kemoticons-5.54.0/src/core/CMakeLists.txt --- old/kemoticons-5.53.0/src/core/CMakeLists.txt 2018-12-01 15:39:35.000000000 +0100 +++ new/kemoticons-5.54.0/src/core/CMakeLists.txt 2019-01-04 22:42:17.000000000 +0100 @@ -7,6 +7,8 @@ kemoticonsglobal.cpp ) +ecm_qt_declare_logging_category(kemoticons_LIB_SRCS HEADER kemoticons_core_debug.h IDENTIFIER KEMOTICONS_CORE CATEGORY_NAME kf5.kemoticons.core) + add_library(KF5Emoticons ${kemoticons_LIB_SRCS}) generate_export_header(KF5Emoticons BASE_NAME KEmoticons) add_library(KF5::Emoticons ALIAS KF5Emoticons) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.53.0/src/core/kemoticons.cpp new/kemoticons-5.54.0/src/core/kemoticons.cpp --- old/kemoticons-5.53.0/src/core/kemoticons.cpp 2018-12-01 15:39:35.000000000 +0100 +++ new/kemoticons-5.54.0/src/core/kemoticons.cpp 2019-01-04 22:42:17.000000000 +0100 @@ -25,7 +25,7 @@ #include <QDir> #include <QMimeDatabase> #include <QStandardPaths> -#include <QDebug> +#include "kemoticons_core_debug.h" #include <QFileSystemWatcher> #include <kpluginloader.h> @@ -88,7 +88,7 @@ { KPluginFactory *factory = qobject_cast<KPluginFactory *>(plugin.instantiate()); if (!factory) { - qWarning() << "Invalid plugin factory for" << plugin.fileName(); + qCWarning(KEMOTICONS_CORE) << "Invalid plugin factory for" << plugin.fileName(); return nullptr; } KEmoticonsProvider *provider = factory->create<KEmoticonsProvider>(nullptr); @@ -99,7 +99,7 @@ { KPluginFactory *factory = KPluginLoader(service->library()).factory(); if (!factory) { - qWarning() << "Invalid plugin factory for" << service->library(); + qCWarning(KEMOTICONS_CORE) << "Invalid plugin factory for" << service->library(); return nullptr; } KEmoticonsProvider *provider = factory->create<KEmoticonsProvider>(nullptr); @@ -159,7 +159,7 @@ : d(new KEmoticonsPrivate(this)) { d->loadServiceList(); - connect(&d->m_fileWatcher, SIGNAL(fileChanged(QString)), this, SLOT(changeTheme(QString))); + connect(&d->m_fileWatcher, &QFileSystemWatcher::fileChanged, this, [this](const QString &str) {d->changeTheme(str);}); } KEmoticons::~KEmoticons() @@ -245,7 +245,7 @@ const QString localThemesDir(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QStringLiteral("/emoticons")); if (localThemesDir.isEmpty()) { - qCritical() << "Could not find a suitable place in which to install the emoticon theme"; + qCCritical(KEMOTICONS_CORE) << "Could not find a suitable place in which to install the emoticon theme"; return QStringList(); } @@ -272,7 +272,7 @@ } if (!archive || !archive->open(QIODevice::ReadOnly)) { - qCritical() << "Could not open" << archiveName << "for unpacking"; + qCCritical(KEMOTICONS_CORE) << "Could not open" << archiveName << "for unpacking"; delete archive; return QStringList(); } @@ -303,7 +303,7 @@ } if (foundThemes.isEmpty()) { - qCritical() << "The file" << archiveName << "is not a valid emoticon theme archive"; + qCCritical(KEMOTICONS_CORE) << "The file" << archiveName << "is not a valid emoticon theme archive"; archive->close(); delete archive; return QStringList(); @@ -314,7 +314,7 @@ currentEntry = const_cast<KArchiveEntry *>(rootDir->entry(theme)); if (currentEntry == nullptr) { - // qDebug() << "couldn't get next archive entry"; + // qCDebug(KEMOTICONS_CORE) << "couldn't get next archive entry"; continue; } @@ -322,7 +322,7 @@ currentDir = dynamic_cast<KArchiveDirectory *>(currentEntry); if (currentDir == nullptr) { - // qDebug() << "couldn't cast archive entry to KArchiveDirectory"; + // qCDebug(KEMOTICONS_CORE) << "couldn't cast archive entry to KArchiveDirectory"; continue; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.53.0/src/core/kemoticons.h new/kemoticons-5.54.0/src/core/kemoticons.h --- old/kemoticons-5.53.0/src/core/kemoticons.h 2018-12-01 15:39:35.000000000 +0100 +++ new/kemoticons-5.54.0/src/core/kemoticons.h 2019-01-04 22:42:17.000000000 +0100 @@ -148,8 +148,6 @@ * Private implementation class */ const QScopedPointer<KEmoticonsPrivate> d; - - Q_PRIVATE_SLOT(d, void changeTheme(const QString &path)) }; #endif /* KEMOTICONS_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.53.0/src/core/kemoticonsglobal.cpp new/kemoticons-5.54.0/src/core/kemoticonsglobal.cpp --- old/kemoticons-5.53.0/src/core/kemoticonsglobal.cpp 2018-12-01 15:39:35.000000000 +0100 +++ new/kemoticons-5.54.0/src/core/kemoticonsglobal.cpp 2019-01-04 22:42:17.000000000 +0100 @@ -21,7 +21,7 @@ #include <KConfigGroup> #include <KSharedConfig> #include <QDBusConnection> -#include <QDebug> +#include "kemoticons_core_debug.h" static const char s_dbusPath[] = "/KEmoticons"; static const char s_dbusInterface[] = "org.kde.kf5.KEmoticons"; @@ -51,7 +51,7 @@ QDBusMessage message = QDBusMessage::createSignal(QString::fromLatin1(s_dbusPath), QString::fromLatin1(s_dbusInterface), QString::fromLatin1(s_themeChangedSignal)); message << name; if (!QDBusConnection::sessionBus().send(message)) { - qWarning() << "Error sending dbus signal" << s_themeChangedSignal; + qCWarning(KEMOTICONS_CORE) << "Error sending dbus signal" << s_themeChangedSignal; } } @@ -67,7 +67,7 @@ QDBusMessage message = QDBusMessage::createSignal(QString::fromLatin1(s_dbusPath), QString::fromLatin1(s_dbusInterface), QString::fromLatin1(s_parseModeChangedSignal)); message << static_cast<int>(mode); if (!QDBusConnection::sessionBus().send(message)) { - qWarning() << "Error sending dbus signal" << s_parseModeChangedSignal; + qCWarning(KEMOTICONS_CORE) << "Error sending dbus signal" << s_parseModeChangedSignal; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.53.0/src/core/kemoticonsprovider.cpp new/kemoticons-5.54.0/src/core/kemoticonsprovider.cpp --- old/kemoticons-5.53.0/src/core/kemoticonsprovider.cpp 2018-12-01 15:39:35.000000000 +0100 +++ new/kemoticons-5.54.0/src/core/kemoticonsprovider.cpp 2019-01-04 22:42:17.000000000 +0100 @@ -23,7 +23,7 @@ #include <QDir> #include <QUrl> #include <QPixmap> -#include <QDebug> +#include "kemoticons_core_debug.h" class KEmoticonsProviderPrivate { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.53.0/src/core/kemoticonstheme.cpp new/kemoticons-5.54.0/src/core/kemoticonstheme.cpp --- old/kemoticons-5.53.0/src/core/kemoticonstheme.cpp 2018-12-01 15:39:35.000000000 +0100 +++ new/kemoticons-5.54.0/src/core/kemoticonstheme.cpp 2019-01-04 22:42:17.000000000 +0100 @@ -22,7 +22,7 @@ #include "kemoticonstheme.h" #include "kemoticons.h" -#include <QDebug> +#include "kemoticons_core_debug.h" class Q_DECL_HIDDEN KEmoticonsTheme::KEmoticonsThemeData : public QSharedData { @@ -173,7 +173,7 @@ } break; default: - qWarning() << "Unknown token type. Something's broken."; + qCWarning(KEMOTICONS_CORE) << "Unknown token type. Something's broken."; break; } } @@ -302,12 +302,12 @@ if (!found) { if (inHTMLEntity) { // If we are in an HTML entitiy such as > - int htmlEnd = message.indexOf(QLatin1Char(';'), pos); + const int htmlEnd = message.indexOf(QLatin1Char(';'), pos); // Search for where it ends if (htmlEnd == -1) { // Apparently this HTML entity isn't ended, something is wrong, try skip the '&' // and continue - // qDebug() << "Broken HTML entity, trying to recover."; + // qCDebug(KEMOTICONS_CORE) << "Broken HTML entity, trying to recover."; inHTMLEntity = false; pos++; } else { @@ -331,7 +331,7 @@ pos = 0; int length; - for (int i = 0; i < foundEmoticons.size(); ++i) { + for (int i = 0, total = foundEmoticons.size(); i < total; ++i) { EmoticonNode itFound = foundEmoticons.at(i); needle = (mode & SkipHTML) ? itFound.first.matchTextEscaped : itFound.first.matchText; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.53.0/src/providers/adium/CMakeLists.txt new/kemoticons-5.54.0/src/providers/adium/CMakeLists.txt --- old/kemoticons-5.53.0/src/providers/adium/CMakeLists.txt 2018-12-01 15:39:35.000000000 +0100 +++ new/kemoticons-5.54.0/src/providers/adium/CMakeLists.txt 2019-01-04 22:42:17.000000000 +0100 @@ -2,6 +2,8 @@ ########### next target ############### set(adiumemoticons_SRCS adium_emoticons.cpp) +ecm_qt_declare_logging_category(adiumemoticons_SRCS HEADER kemoticons_plugin_adium_debug.h IDENTIFIER KEMOTICONS_PLUGIN_ADIUM CATEGORY_NAME kf5.kemoticons.plugin_adium) + kcoreaddons_add_plugin(emoticonstheme_adium INSTALL_NAMESPACE kf5/emoticonsthemes JSON emoticonstheme_adium.json SOURCES ${adiumemoticons_SRCS}) find_package(Qt5Xml REQUIRED) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.53.0/src/providers/adium/adium_emoticons.cpp new/kemoticons-5.54.0/src/providers/adium/adium_emoticons.cpp --- old/kemoticons-5.53.0/src/providers/adium/adium_emoticons.cpp 2018-12-01 15:39:35.000000000 +0100 +++ new/kemoticons-5.54.0/src/providers/adium/adium_emoticons.cpp 2019-01-04 22:42:17.000000000 +0100 @@ -22,7 +22,7 @@ #include <QDir> #include <QFileInfo> #include <QStandardPaths> -#include <QDebug> +#include "kemoticons_plugin_adium_debug.h" #include <kpluginfactory.h> @@ -66,7 +66,7 @@ if (option == Copy) { bool result = copyEmoticon(emo); if (!result) { - qWarning() << "There was a problem copying the emoticon"; + qCWarning(KEMOTICONS_PLUGIN_ADIUM) << "There was a problem copying the emoticon"; return false; } } @@ -119,12 +119,12 @@ QFile fp(themePath() + QLatin1Char('/') + fileName()); if (!fp.exists()) { - qWarning() << fp.fileName() << "doesn't exist!"; + qCWarning(KEMOTICONS_PLUGIN_ADIUM) << fp.fileName() << "doesn't exist!"; return; } if (!fp.open(QIODevice::WriteOnly)) { - qWarning() << fp.fileName() << "can't open WriteOnly!"; + qCWarning(KEMOTICONS_PLUGIN_ADIUM) << fp.fileName() << "can't open WriteOnly!"; return; } @@ -139,21 +139,21 @@ QFile file(path); if (!file.exists()) { - qWarning() << path << "doesn't exist!"; + qCWarning(KEMOTICONS_PLUGIN_ADIUM) << path << "doesn't exist!"; return false; } setThemePath(path); if (!file.open(QIODevice::ReadOnly)) { - qWarning() << file.fileName() << "can't be open ReadOnly!"; + qCWarning(KEMOTICONS_PLUGIN_ADIUM) << file.fileName() << "can't be open ReadOnly!"; return false; } QString error; int eli, eco; if (!m_themeXml.setContent(&file, &error, &eli, &eco)) { - qWarning() << file.fileName() << "can't copy to xml!"; - qWarning() << error << "line:" << eli << "column:" << eco; + qCWarning(KEMOTICONS_PLUGIN_ADIUM) << file.fileName() << "can't copy to xml!"; + qCWarning(KEMOTICONS_PLUGIN_ADIUM) << error << "line:" << eli << "column:" << eco; file.close(); return false; } @@ -207,7 +207,7 @@ QFile fp(path + QLatin1Char('/') + QStringLiteral("Emoticons.plist")); if (!fp.open(QIODevice::WriteOnly)) { - qWarning() << fp.fileName() << "can't open WriteOnly!"; + qCWarning(KEMOTICONS_PLUGIN_ADIUM) << fp.fileName() << "can't open WriteOnly!"; return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.53.0/src/providers/adium/emoticonstheme_adium.desktop new/kemoticons-5.54.0/src/providers/adium/emoticonstheme_adium.desktop --- old/kemoticons-5.53.0/src/providers/adium/emoticonstheme_adium.desktop 2018-12-01 15:39:35.000000000 +0100 +++ new/kemoticons-5.54.0/src/providers/adium/emoticonstheme_adium.desktop 2019-01-04 22:42:17.000000000 +0100 @@ -36,7 +36,7 @@ Name[ia]=Thema de emoticones Adium Name[id]=Tema Emoticon Adium Name[is]=Adium broskallaþema -Name[it]=Tema faccine Adium +Name[it]=Tema di faccine Adium Name[ja]=Adium 感情アイコンテーマ Name[kk]=Adium көңіл-күй белгілер нақышы Name[km]=ស្បែកសញ្ញាអារម្មណ៍របស់ Adium @@ -115,7 +115,7 @@ Comment[ia]=Libreria per usar le thema de emoticones Adium Comment[id]=Pustaka untuk menggunakan tema emoticon Adium Comment[is]=Forritlingasafn til notkunar með Adium broskallaþema -Comment[it]=Libreria per usare il tema faccine Adium +Comment[it]=Libreria per usare il tema di faccine Adium Comment[ja]=Adium 感情アイコンテーマのライブラリ Comment[kk]=Adium көңіл-күй белгілер нақышының жиыны Comment[km]=បណ្ណាល័យត្រូវប្រើស្បែកសញ្ញាអារម្មណ៍ Adium diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.53.0/src/providers/kde/CMakeLists.txt new/kemoticons-5.54.0/src/providers/kde/CMakeLists.txt --- old/kemoticons-5.53.0/src/providers/kde/CMakeLists.txt 2018-12-01 15:39:35.000000000 +0100 +++ new/kemoticons-5.54.0/src/providers/kde/CMakeLists.txt 2019-01-04 22:42:17.000000000 +0100 @@ -2,6 +2,8 @@ ########### next target ############### set(kdeemoticons_SRCS kde_emoticons.cpp) +ecm_qt_declare_logging_category(kdeemoticons_SRCS HEADER kemoticons_plugin_kde_debug.h IDENTIFIER KEMOTICONS_PLUGIN_KDE CATEGORY_NAME kf5.kemoticons.plugin_kde) + kcoreaddons_add_plugin(emoticonstheme_kde INSTALL_NAMESPACE kf5/emoticonsthemes JSON emoticonstheme_kde.json SOURCES ${kdeemoticons_SRCS}) find_package(Qt5Xml REQUIRED) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.53.0/src/providers/kde/emoticonstheme_kde.desktop new/kemoticons-5.54.0/src/providers/kde/emoticonstheme_kde.desktop --- old/kemoticons-5.53.0/src/providers/kde/emoticonstheme_kde.desktop 2018-12-01 15:39:35.000000000 +0100 +++ new/kemoticons-5.54.0/src/providers/kde/emoticonstheme_kde.desktop 2019-01-04 22:42:17.000000000 +0100 @@ -28,7 +28,7 @@ Name[ia]=Thema de emoticones de KDE Name[id]=Tema Emoticon KDE Name[is]=KDE broskallaþema -Name[it]=Tema faccine di KDE +Name[it]=Tema di faccine di KDE Name[ja]=KDE 感情アイコンテーマ Name[kk]=KDE көңіл-күй белгілер нақышы Name[km]=ស្បែកសញ្ញាអារម្មណ៍របស់ KDE @@ -104,7 +104,7 @@ Comment[ia]=Libreria per usar le thema de emoticones de KDE Comment[id]=Pustaka untuk menggunakan tema emoticon KDE Comment[is]=Forritlingasafn til notkunar með KDE broskallaþema -Comment[it]=Libreria per usare il tema faccine di Kde +Comment[it]=Libreria per usare il tema di faccine di Kde Comment[ja]=KDE 感情アイコンテーマのライブラリ Comment[kk]=KDE көңіл-күй белгілер нақышының жиыны Comment[km]=បណ្ណាល័យត្រូវប្រើស្បែកសញ្ញាអារម្មណ៍របស់ KDE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.53.0/src/providers/kde/kde_emoticons.cpp new/kemoticons-5.54.0/src/providers/kde/kde_emoticons.cpp --- old/kemoticons-5.53.0/src/providers/kde/kde_emoticons.cpp 2018-12-01 15:39:35.000000000 +0100 +++ new/kemoticons-5.54.0/src/providers/kde/kde_emoticons.cpp 2019-01-04 22:42:17.000000000 +0100 @@ -20,7 +20,7 @@ #include <QFile> #include <QDir> -#include <QDebug> +#include "kemoticons_plugin_kde_debug.h" #include <QFileInfo> #include <QStandardPaths> #include <QImageReader> @@ -62,7 +62,7 @@ if (option == Copy) { bool result = copyEmoticon(emo); if (!result) { - qWarning() << "There was a problem copying the emoticon"; + qCWarning(KEMOTICONS_PLUGIN_KDE) << "There was a problem copying the emoticon"; return false; } } @@ -95,12 +95,12 @@ QFile fp(themePath() + QLatin1Char('/') + fileName()); if (!fp.exists()) { - qWarning() << fp.fileName() << "doesn't exist!"; + qCWarning(KEMOTICONS_PLUGIN_KDE) << fp.fileName() << "doesn't exist!"; return; } if (!fp.open(QIODevice::WriteOnly)) { - qWarning() << fp.fileName() << "can't open WriteOnly!"; + qCWarning(KEMOTICONS_PLUGIN_KDE) << fp.fileName() << "can't open WriteOnly!"; return; } @@ -115,21 +115,21 @@ QFile file(path); if (!file.exists()) { - qWarning() << path << "doesn't exist!"; + qCWarning(KEMOTICONS_PLUGIN_KDE) << path << "doesn't exist!"; return false; } setThemePath(path); if (!file.open(QIODevice::ReadOnly)) { - qWarning() << file.fileName() << "can't be open ReadOnly!"; + qCWarning(KEMOTICONS_PLUGIN_KDE) << file.fileName() << "can't be open ReadOnly!"; return false; } QString error; int eli, eco; if (!m_themeXml.setContent(&file, &error, &eli, &eco)) { - qWarning() << file.fileName() << "can't copy to xml!"; - qWarning() << error << "line:" << eli << "column:" << eco; + qCWarning(KEMOTICONS_PLUGIN_KDE) << file.fileName() << "can't copy to xml!"; + qCWarning(KEMOTICONS_PLUGIN_KDE) << error << "line:" << eli << "column:" << eco; file.close(); return false; } @@ -196,7 +196,7 @@ QFile fp(path + QLatin1Char('/') + QStringLiteral("emoticons.xml")); if (!fp.open(QIODevice::WriteOnly)) { - qWarning() << fp.fileName() << "can't open WriteOnly!"; + qCWarning(KEMOTICONS_PLUGIN_KDE) << fp.fileName() << "can't open WriteOnly!"; return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.53.0/src/providers/pidgin/CMakeLists.txt new/kemoticons-5.54.0/src/providers/pidgin/CMakeLists.txt --- old/kemoticons-5.53.0/src/providers/pidgin/CMakeLists.txt 2018-12-01 15:39:35.000000000 +0100 +++ new/kemoticons-5.54.0/src/providers/pidgin/CMakeLists.txt 2019-01-04 22:42:17.000000000 +0100 @@ -2,6 +2,8 @@ ########### next target ############### set(pidginemoticons_SRCS pidgin_emoticons.cpp) +ecm_qt_declare_logging_category(pidginemoticons_SRCS HEADER kemoticons_plugin_pidgin_debug.h IDENTIFIER KEMOTICONS_PLUGIN_PIDGIN CATEGORY_NAME kf5.kemoticons.plugin_pidgin) + kcoreaddons_add_plugin(emoticonstheme_pidgin INSTALL_NAMESPACE kf5/emoticonsthemes JSON emoticonstheme_pidgin.json SOURCES ${pidginemoticons_SRCS}) target_link_libraries(emoticonstheme_pidgin PRIVATE KF5::Emoticons) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.53.0/src/providers/pidgin/emoticonstheme_pidgin.desktop new/kemoticons-5.54.0/src/providers/pidgin/emoticonstheme_pidgin.desktop --- old/kemoticons-5.53.0/src/providers/pidgin/emoticonstheme_pidgin.desktop 2018-12-01 15:39:35.000000000 +0100 +++ new/kemoticons-5.54.0/src/providers/pidgin/emoticonstheme_pidgin.desktop 2019-01-04 22:42:17.000000000 +0100 @@ -37,7 +37,7 @@ Name[ia]=Thema de emoticones Pidgin Name[id]=Tema Emoticon Pidgin Name[is]=Pidgin broskallaþema -Name[it]=Tema faccine Pidgin +Name[it]=Tema di faccine Pidgin Name[ja]=Pidgin 感情アイコンテーマ Name[kk]=Pidgin көңіл-күй белгілер нақышы Name[km]=ស្បែកសញ្ញាអារម្មណ៍របស់ Pidgin @@ -117,7 +117,7 @@ Comment[ia]=Libreria per usar le thema de emoticones Pidgin Comment[id]=Pustaka untuk menggunakan tema emoticon Pidgin Comment[is]=Forritlingasafn til notkunar með Pidgin broskallaþema -Comment[it]=Libreria per usare il tema faccine Pidgin +Comment[it]=Libreria per usare il tema di faccine Pidgin Comment[ja]=Pidgin 感情アイコンテーマのライブラリ Comment[kk]=Pidgin көңіл-күй белгілер нақышының жиыны Comment[km]=បណ្ណាល័យត្រូវប្រើស្បែកសញ្ញាអារម្មណ៍របស់ Pidgin diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.53.0/src/providers/pidgin/pidgin_emoticons.cpp new/kemoticons-5.54.0/src/providers/pidgin/pidgin_emoticons.cpp --- old/kemoticons-5.53.0/src/providers/pidgin/pidgin_emoticons.cpp 2018-12-01 15:39:35.000000000 +0100 +++ new/kemoticons-5.54.0/src/providers/pidgin/pidgin_emoticons.cpp 2019-01-04 22:42:17.000000000 +0100 @@ -21,7 +21,7 @@ #include <QFile> #include <QDir> -#include <QDebug> +#include "kemoticons_plugin_pidgin_debug.h" #include <QFileInfo> #include <QStandardPaths> @@ -86,7 +86,7 @@ if (option == Copy) { bool result = copyEmoticon(emo); if (!result) { - qWarning() << "There was a problem copying the emoticon"; + qCWarning(KEMOTICONS_PLUGIN_PIDGIN) << "There was a problem copying the emoticon"; return false; } } @@ -112,12 +112,12 @@ QFile fp(themePath() + QLatin1Char('/') + fileName()); if (!fp.exists()) { - qWarning() << fp.fileName() << "doesn't exist!"; + qCWarning(KEMOTICONS_PLUGIN_PIDGIN) << fp.fileName() << "doesn't exist!"; return; } if (!fp.open(QIODevice::WriteOnly)) { - qWarning() << fp.fileName() << "can't open WriteOnly!"; + qCWarning(KEMOTICONS_PLUGIN_PIDGIN) << fp.fileName() << "can't open WriteOnly!"; return; } @@ -138,13 +138,13 @@ QFile file(path); if (!file.exists()) { - qWarning() << path << "doesn't exist!"; + qCWarning(KEMOTICONS_PLUGIN_PIDGIN) << path << "doesn't exist!"; return false; } setThemePath(path); if (!file.open(QIODevice::ReadOnly)) { - qWarning() << file.fileName() << "can't be open ReadOnly!"; + qCWarning(KEMOTICONS_PLUGIN_PIDGIN) << file.fileName() << "can't be open ReadOnly!"; return false; } @@ -209,7 +209,7 @@ QFile fp(path + QLatin1Char('/') + QStringLiteral("theme")); if (!fp.open(QIODevice::WriteOnly)) { - qWarning() << fp.fileName() << "can't open WriteOnly!"; + qCWarning(KEMOTICONS_PLUGIN_PIDGIN) << fp.fileName() << "can't open WriteOnly!"; return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.53.0/src/providers/xmpp/CMakeLists.txt new/kemoticons-5.54.0/src/providers/xmpp/CMakeLists.txt --- old/kemoticons-5.53.0/src/providers/xmpp/CMakeLists.txt 2018-12-01 15:39:35.000000000 +0100 +++ new/kemoticons-5.54.0/src/providers/xmpp/CMakeLists.txt 2019-01-04 22:42:17.000000000 +0100 @@ -2,6 +2,8 @@ ########### next target ############### set(xmppemoticons_SRCS xmpp_emoticons.cpp) +ecm_qt_declare_logging_category(xmppemoticons_SRCS HEADER kemoticons_plugin_xmpp_debug.h IDENTIFIER KEMOTICONS_PLUGIN_XMPP CATEGORY_NAME kf5.kemoticons.plugin_xmpp) + kcoreaddons_add_plugin(emoticonstheme_xmpp INSTALL_NAMESPACE kf5/emoticonsthemes JSON emoticonstheme_xmpp.json SOURCES ${xmppemoticons_SRCS}) find_package(Qt5Xml REQUIRED) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.53.0/src/providers/xmpp/emoticonstheme_xmpp.desktop new/kemoticons-5.54.0/src/providers/xmpp/emoticonstheme_xmpp.desktop --- old/kemoticons-5.53.0/src/providers/xmpp/emoticonstheme_xmpp.desktop 2018-12-01 15:39:35.000000000 +0100 +++ new/kemoticons-5.54.0/src/providers/xmpp/emoticonstheme_xmpp.desktop 2019-01-04 22:42:17.000000000 +0100 @@ -36,7 +36,7 @@ Name[ia]=Thema de emoticones XMPP Name[id]=Tema Emoticon XMPP Name[is]=XMPP broskallaþema -Name[it]=Tema faccine XMPP +Name[it]=Tema di faccine XMPP Name[ja]=XMPP 感情アイコンテーマ Name[kk]=XMPP көңіл-күй белгілер нақышы Name[km]=ស្បែកសញ្ញាអារម្មណ៍របស់ XMPP @@ -116,7 +116,7 @@ Comment[ia]=Libreria per usar le thema de emoticones XMPP Comment[id]=Pustaka untuk menggunakan tema emoticon XMPP Comment[is]=Forritlingasafn til notkunar með XMPP broskallaþema -Comment[it]=Libreria per usare il tema faccine XMPP +Comment[it]=Libreria per usare il tema di faccine XMPP Comment[ja]=XMPP 感情アイコンテーマのライブラリ Comment[kk]=XMPP көңіл-күй белгілер нақышының жиыны Comment[km]=បណ្ណាល័យត្រូវប្រើស្បែកសញ្ញាអារម្មណ៍របស់ XMPP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.53.0/src/providers/xmpp/xmpp_emoticons.cpp new/kemoticons-5.54.0/src/providers/xmpp/xmpp_emoticons.cpp --- old/kemoticons-5.53.0/src/providers/xmpp/xmpp_emoticons.cpp 2018-12-01 15:39:35.000000000 +0100 +++ new/kemoticons-5.54.0/src/providers/xmpp/xmpp_emoticons.cpp 2019-01-04 22:42:17.000000000 +0100 @@ -20,7 +20,7 @@ #include <QFile> #include <QDir> -#include <QDebug> +#include "kemoticons_plugin_xmpp_debug.h" #include <QFileInfo> #include <QStandardPaths> #include <QImageReader> @@ -71,7 +71,7 @@ if (option == Copy) { bool result = copyEmoticon(emo); if (!result) { - qWarning() << "There was a problem copying the emoticon"; + qCWarning(KEMOTICONS_PLUGIN_XMPP) << "There was a problem copying the emoticon"; return false; } } @@ -113,12 +113,12 @@ QFile fp(themePath() + QLatin1Char('/') + fileName()); if (!fp.exists()) { - qWarning() << fp.fileName() << "doesn't exist!"; + qCWarning(KEMOTICONS_PLUGIN_XMPP) << fp.fileName() << "doesn't exist!"; return; } if (!fp.open(QIODevice::WriteOnly)) { - qWarning() << fp.fileName() << "can't open WriteOnly!"; + qCWarning(KEMOTICONS_PLUGIN_XMPP) << fp.fileName() << "can't open WriteOnly!"; return; } @@ -133,21 +133,21 @@ QFile file(path); if (!file.exists()) { - qWarning() << path << "doesn't exist!"; + qCWarning(KEMOTICONS_PLUGIN_XMPP) << path << "doesn't exist!"; return false; } setThemePath(path); if (!file.open(QIODevice::ReadOnly)) { - qWarning() << file.fileName() << "can't be open ReadOnly!"; + qCWarning(KEMOTICONS_PLUGIN_XMPP) << file.fileName() << "can't be open ReadOnly!"; return false; } QString error; int eli, eco; if (!m_themeXml.setContent(&file, &error, &eli, &eco)) { - qWarning() << file.fileName() << "can't copy to xml!"; - qWarning() << error << "line:" << eli << "column:" << eco; + qCWarning(KEMOTICONS_PLUGIN_XMPP) << file.fileName() << "can't copy to xml!"; + qCWarning(KEMOTICONS_PLUGIN_XMPP) << error << "line:" << eli << "column:" << eco; file.close(); return false; } @@ -206,7 +206,7 @@ QFile fp(path + QLatin1Char('/') + QStringLiteral("icondef.xml")); if (!fp.open(QIODevice::WriteOnly)) { - qWarning() << fp.fileName() << "can't open WriteOnly!"; + qCWarning(KEMOTICONS_PLUGIN_XMPP) << fp.fileName() << "can't open WriteOnly!"; return; }
