Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libkcddb for openSUSE:Factory checked in at 2021-08-16 10:07:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkcddb (Old) and /work/SRC/openSUSE:Factory/.libkcddb.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libkcddb" Mon Aug 16 10:07:00 2021 rev:59 rq:911768 version:21.08.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libkcddb/libkcddb.changes 2021-07-09 23:59:28.768459114 +0200 +++ /work/SRC/openSUSE:Factory/.libkcddb.new.1899/libkcddb.changes 2021-08-16 10:08:45.595297884 +0200 @@ -1,0 +2,24 @@ +Fri Aug 6 09:41:56 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 21.08.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/gear/21.08.0 +- No code change since 21.07.90 + +------------------------------------------------------------------- +Fri Jul 30 10:05:43 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 21.07.90 + * New feature release +- No code change since 21.07.80 + +------------------------------------------------------------------- +Sat Jul 17 20:06:52 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 21.07.80 + * New feature release +- No code change since 21.04.3 +- Only install the license files once + +------------------------------------------------------------------- Old: ---- libkcddb-21.04.3.tar.xz libkcddb-21.04.3.tar.xz.sig New: ---- libkcddb-21.08.0.tar.xz libkcddb-21.08.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkcddb.spec ++++++ --- /var/tmp/diff_new_pack.wYExeY/_old 2021-08-16 10:08:47.299295849 +0200 +++ /var/tmp/diff_new_pack.wYExeY/_new 2021-08-16 10:08:47.303295844 +0200 @@ -21,7 +21,7 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: libkcddb -Version: 21.04.3 +Version: 21.08.0 Release: 0 Summary: CDDB library for KDE Applications License: GPL-2.0-or-later @@ -44,7 +44,6 @@ BuildRequires: cmake(Qt5Network) BuildRequires: cmake(Qt5Test) BuildRequires: cmake(Qt5Widgets) -Recommends: %{name}-lang Obsoletes: libkcddb5 < %{version} Provides: libkcddb5 = %{version} Obsoletes: libkcddb16 < %{version} @@ -96,7 +95,6 @@ %postun -n libKF5Cddb5 -p /sbin/ldconfig %files -%license LICENSES/* %doc %lang(en) %{_kf5_htmldir}/en/*/ %{_kf5_configkcfgdir}/ %{_kf5_debugdir}/libkcddb.categories @@ -108,7 +106,6 @@ %{_kf5_libdir}/libKF5Cddb.so.* %files devel -%license LICENSES/* %{_kf5_cmakedir}/KF5Cddb/ %{_kf5_includedir}/KCddb %{_kf5_includedir}/kcddb_version.h @@ -117,7 +114,6 @@ %if %{with lang} %files lang -f %{name}.lang -%license LICENSES/* %endif %changelog ++++++ libkcddb-21.04.3.tar.xz -> libkcddb-21.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkcddb-21.04.3/CMakeLists.txt new/libkcddb-21.08.0/CMakeLists.txt --- old/libkcddb-21.04.3/CMakeLists.txt 2021-07-06 07:20:44.000000000 +0200 +++ new/libkcddb-21.08.0/CMakeLists.txt 2021-05-17 03:27:01.000000000 +0200 @@ -1,9 +1,9 @@ -cmake_minimum_required (VERSION 3.5 FATAL_ERROR) +cmake_minimum_required(VERSION 3.16 FATAL_ERROR) project(libkcddb VERSION "5.0.0") -set(QT_MIN_VERSION 5.12.0) -set(KF_MIN_VERSION 5.68.0) +set(QT_MIN_VERSION 5.15.0) +set(KF_MIN_VERSION 5.80.0) # ECM setup include(FeatureSummary) @@ -14,6 +14,7 @@ include(KDEInstallDirs) include(KDECMakeSettings) include(KDECompilerSettings NO_POLICY_SCOPE) + include(GenerateExportHeader) include(ECMSetupVersion) include(ECMQtDeclareLoggingCategory) @@ -23,13 +24,6 @@ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Network Widgets) find_package(KF5 ${KF_MIN_VERSION} REQUIRED COMPONENTS Config DocTools I18n KIO WidgetsAddons) -ecm_setup_version(${libkcddb_VERSION} - VARIABLE_PREFIX KCDDB - VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kcddb_version.h" - PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5CddbConfigVersion.cmake" - SOVERSION 5 -) - find_package(MusicBrainz5) set_package_properties(MusicBrainz5 PROPERTIES DESCRIPTION "Music metadata lookup for KDE multimedia applications through libkcddb. You need version 5.x of libmusicbrainz" @@ -48,7 +42,8 @@ -DQT_NO_CAST_FROM_ASCII -DQT_NO_URL_CAST_FROM_STRING -DQT_NO_CAST_FROM_BYTEARRAY - -DQT_NO_SIGNALS_SLOTS_KEYWORDS + -DQT_NO_KEYWORDS + -DQT_NO_FOREACH -DQT_USE_QSTRINGBUILDER -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -DQT_STRICT_ITERATORS @@ -65,35 +60,6 @@ add_subdirectory(tests) endif() -set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5Cddb") -configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/KF5CddbConfig.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/KF5CddbConfig.cmake" - INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} -) - -install(FILES - "${CMAKE_CURRENT_BINARY_DIR}/KF5CddbConfig.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/KF5CddbConfigVersion.cmake" - DESTINATION "${CMAKECONFIG_INSTALL_DIR}" - COMPONENT Devel -) - -install(EXPORT - KF5CddbTargets - DESTINATION "${CMAKECONFIG_INSTALL_DIR}" - FILE KF5CddbTargets.cmake - NAMESPACE KF5:: - COMPONENT Devel -) - -install(FILES - "${CMAKE_CURRENT_BINARY_DIR}/kcddb_version.h" - DESTINATION "${KDE_INSTALL_INCLUDEDIR_KF5}" - COMPONENT Devel -) +ki18n_install(po) feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) -ki18n_install(po) -if (KF5DocTools_FOUND) - kdoctools_install(po) -endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkcddb-21.04.3/KF5CddbConfig.cmake.in new/libkcddb-21.08.0/KF5CddbConfig.cmake.in --- old/libkcddb-21.04.3/KF5CddbConfig.cmake.in 2021-01-24 06:55:04.000000000 +0100 +++ new/libkcddb-21.08.0/KF5CddbConfig.cmake.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -@PACKAGE_INIT@ - -include(CMakeFindDependencyMacro) -find_dependency(Qt5Widgets "@QT_MIN_VERSION@") - -include("${CMAKE_CURRENT_LIST_DIR}/KF5CddbTargets.cmake") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkcddb-21.04.3/kcmcddb/CMakeLists.txt new/libkcddb-21.08.0/kcmcddb/CMakeLists.txt --- old/libkcddb-21.04.3/kcmcddb/CMakeLists.txt 2021-01-24 06:55:04.000000000 +0100 +++ new/libkcddb-21.08.0/kcmcddb/CMakeLists.txt 2021-05-17 03:27:01.000000000 +0200 @@ -2,12 +2,14 @@ add_subdirectory(doc) -ki18n_wrap_ui(ui_sources cddbconfigwidget.ui) +add_library(kcm_cddb MODULE) -add_library(kcm_cddb MODULE +ki18n_wrap_ui(kcm_cddb cddbconfigwidget.ui) + +target_sources(kcm_cddb PRIVATE cddbconfigwidget.cpp kcmcddb.cpp - ${ui_sources}) +) set_source_files_properties(cddbconfigwidget.cpp PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/ui_cddbconfigwidget.h) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkcddb-21.04.3/libkcddb/CMakeLists.txt new/libkcddb-21.08.0/libkcddb/CMakeLists.txt --- old/libkcddb-21.04.3/libkcddb/CMakeLists.txt 2021-01-24 06:55:04.000000000 +0100 +++ new/libkcddb-21.08.0/libkcddb/CMakeLists.txt 2021-05-17 03:27:01.000000000 +0200 @@ -1,5 +1,18 @@ add_definitions(-DTRANSLATION_DOMAIN="libkcddb") +set(KCDDB_INSTALL_INCLUDEDIR "${KDE_INSTALL_INCLUDEDIR_KF5}/KCddb") +set(KCDDB_CMAKECONFIG_NAME "KF5Cddb") + +ecm_setup_version(${libkcddb_VERSION} + VARIABLE_PREFIX KCDDB + VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kcddb_version.h" + PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/${KCDDB_CMAKECONFIG_NAME}ConfigVersion.cmake" + SOVERSION 5 +) + +add_library(KCddb SHARED) +add_library(KF5::Cddb ALIAS KCddb) + if(MUSICBRAINZ5_FOUND) set(musicbrainz_sources musicbrainz/musicbrainzlookup.cpp @@ -16,9 +29,9 @@ set_source_files_properties(${musicbrainz_sources} PROPERTIES COMPILE_FLAGS ${enable_exceptions}) endif() -kconfig_add_kcfg_files(kcfg_sources configbase.kcfgc) +kconfig_add_kcfg_files(KCddb configbase.kcfgc) -ecm_qt_declare_logging_category(log_sources +ecm_qt_declare_logging_category(KCddb HEADER logging.h IDENTIFIER LIBKCDDB CATEGORY_NAME "libkcddb" @@ -26,7 +39,7 @@ EXPORT KCDDB ) -add_library(KF5Cddb SHARED +target_sources(KCddb PRIVATE cache.cpp cdinfo.cpp kcddbconfig.cpp @@ -51,54 +64,60 @@ categories.cpp genres.cpp ${musicbrainz_sources} - ${log_sources} - ${kcfg_sources}) +) -target_link_libraries(KF5Cddb +target_link_libraries(KCddb PUBLIC KF5::ConfigGui PRIVATE KF5::I18n KF5::KIOCore - Qt5::Network) + Qt5::Network +) if(MUSICBRAINZ5_FOUND) - target_link_libraries(KF5Cddb PRIVATE musicbrainz) + target_link_libraries(KCddb PRIVATE musicbrainz) endif() -generate_export_header(KF5Cddb BASE_NAME KCddb) -add_library(KF5::Cddb ALIAS KF5Cddb) -target_include_directories(KF5Cddb PUBLIC "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KCddb>") +generate_export_header(KCddb BASE_NAME KCddb) +target_include_directories(KCddb + PUBLIC + "$<INSTALL_INTERFACE:${KCDDB_INSTALL_INCLUDEDIR}>" +) -set_target_properties(KF5Cddb PROPERTIES VERSION ${KCDDB_VERSION_STRING} +set_target_properties(KCddb PROPERTIES + VERSION ${KCDDB_VERSION} SOVERSION ${KCDDB_SOVERSION} + OUTPUT_NAME KF5Cddb EXPORT_NAME Cddb ) ecm_generate_headers(KCddb_HEADERS HEADER_NAMES - Categories - Cdinfo - Client - Genres - KcddbConfig - Kcddb - + Categories + Cdinfo + Client + Genres + KcddbConfig + Kcddb REQUIRED_HEADERS KCddb_HEADERS ) -install(TARGETS KF5Cddb EXPORT KF5CddbTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) +install(TARGETS KCddb EXPORT KCddbTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kcddb_export.h ${CMAKE_CURRENT_BINARY_DIR}/configbase.h ${KCddb_HEADERS} - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KCddb COMPONENT Devel + DESTINATION ${KCDDB_INSTALL_INCLUDEDIR} + COMPONENT Devel ) -include(ECMGeneratePriFile) -ecm_generate_pri_file(BASE_NAME KCddb LIB_NAME KF5Cddb DEPS "Qt5Widgets" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/KCddb) -install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) +install(FILES + "${CMAKE_CURRENT_BINARY_DIR}/kcddb_version.h" + DESTINATION "${KDE_INSTALL_INCLUDEDIR_KF5}" + COMPONENT Devel +) install(FILES libkcddb5.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR}) @@ -107,3 +126,34 @@ FILE libkcddb.categories DESTINATION "${KDE_INSTALL_LOGGINGCATEGORIESDIR}" ) + +set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/${KCDDB_CMAKECONFIG_NAME}") +configure_package_config_file( + "${CMAKE_CURRENT_SOURCE_DIR}/${KCDDB_CMAKECONFIG_NAME}Config.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/${KCDDB_CMAKECONFIG_NAME}Config.cmake" + INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} +) + +install(FILES + "${CMAKE_CURRENT_BINARY_DIR}/${KCDDB_CMAKECONFIG_NAME}Config.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/${KCDDB_CMAKECONFIG_NAME}ConfigVersion.cmake" + DESTINATION "${CMAKECONFIG_INSTALL_DIR}" + COMPONENT Devel +) + +install(EXPORT KCddbTargets + DESTINATION "${CMAKECONFIG_INSTALL_DIR}" + FILE ${KCDDB_CMAKECONFIG_NAME}Targets.cmake + NAMESPACE KF5:: + COMPONENT Devel +) + +include(ECMGeneratePriFile) +ecm_generate_pri_file( + BASE_NAME KCddb + LIB_NAME KF5Cddb + DEPS "Qt5Widgets" + FILENAME_VAR PRI_FILENAME + INCLUDE_INSTALL_DIR ${KCDDB_INSTALL_INCLUDEDIR} +) +install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkcddb-21.04.3/libkcddb/KF5CddbConfig.cmake.in new/libkcddb-21.08.0/libkcddb/KF5CddbConfig.cmake.in --- old/libkcddb-21.04.3/libkcddb/KF5CddbConfig.cmake.in 1970-01-01 01:00:00.000000000 +0100 +++ new/libkcddb-21.08.0/libkcddb/KF5CddbConfig.cmake.in 2021-05-17 03:27:01.000000000 +0200 @@ -0,0 +1,6 @@ +@PACKAGE_INIT@ + +include(CMakeFindDependencyMacro) +find_dependency(KF5Config "@KF_MIN_VERSIONN@") + +include("${CMAKE_CURRENT_LIST_DIR}/KF5CddbTargets.cmake") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkcddb-21.04.3/libkcddb/asynccddbplookup.cpp new/libkcddb-21.08.0/libkcddb/asynccddbplookup.cpp --- old/libkcddb-21.04.3/libkcddb/asynccddbplookup.cpp 2021-01-24 06:55:04.000000000 +0100 +++ new/libkcddb-21.08.0/libkcddb/asynccddbplookup.cpp 2021-05-17 03:27:01.000000000 +0200 @@ -53,11 +53,11 @@ state_ = Idle; if ( error == QAbstractSocket::HostNotFoundError ) - emit finished( HostNotFound ); + Q_EMIT finished( HostNotFound ); else if ( error == QAbstractSocket::SocketTimeoutError ) - emit finished( NoResponse ); + Q_EMIT finished( NoResponse ); else - emit finished( UnknownError ); + Q_EMIT finished( UnknownError ); } void @@ -189,7 +189,7 @@ close(); - emit finished( result_ ); + Q_EMIT finished( result_ ); break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkcddb-21.04.3/libkcddb/asynchttplookup.cpp new/libkcddb-21.08.0/libkcddb/asynchttplookup.cpp --- old/libkcddb-21.04.3/libkcddb/asynchttplookup.cpp 2021-01-24 06:55:04.000000000 +0100 +++ new/libkcddb-21.08.0/libkcddb/asynchttplookup.cpp 2021-05-17 03:27:01.000000000 +0200 @@ -62,7 +62,7 @@ if ( Success != result_ ) { - emit finished( result_ ); + Q_EMIT finished( result_ ); return; } @@ -75,7 +75,7 @@ if ( matchList_.isEmpty() ) { result_ = cdInfoList_.isEmpty()? NoRecordFound : Success; - emit finished( result_ ); + Q_EMIT finished( result_ ); return; } @@ -87,7 +87,7 @@ result_ = sendRead( match ); if ( Success != result_ ) - emit finished( result_ ); + Q_EMIT finished( result_ ); } void @@ -104,7 +104,7 @@ { result_ = ServerError; if ( !block_ ) - emit queryReady(); + Q_EMIT queryReady(); return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkcddb-21.04.3/libkcddb/asynchttpsubmit.cpp new/libkcddb-21.08.0/libkcddb/asynchttpsubmit.cpp --- old/libkcddb-21.04.3/libkcddb/asynchttpsubmit.cpp 2021-01-24 06:55:04.000000000 +0100 +++ new/libkcddb-21.08.0/libkcddb/asynchttpsubmit.cpp 2021-05-17 03:27:01.000000000 +0200 @@ -34,9 +34,9 @@ qDebug() << "Finished"; if ( job->error()==0 ) - emit finished( Success ); + Q_EMIT finished( Success ); else - emit finished( UnknownError ); + Q_EMIT finished( UnknownError ); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkcddb-21.04.3/libkcddb/asyncsmtpsubmit.cpp new/libkcddb-21.08.0/libkcddb/asyncsmtpsubmit.cpp --- old/libkcddb-21.04.3/libkcddb/asyncsmtpsubmit.cpp 2021-01-24 06:55:04.000000000 +0100 +++ new/libkcddb-21.08.0/libkcddb/asyncsmtpsubmit.cpp 2021-05-17 03:27:01.000000000 +0200 @@ -37,9 +37,9 @@ { qCDebug(LIBKCDDB) ; if ( job->error()==0 ) - emit finished( Success ); + Q_EMIT finished( Success ); else - emit finished( UnknownError ); + Q_EMIT finished( UnknownError ); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkcddb-21.04.3/libkcddb/cache.cpp new/libkcddb-21.08.0/libkcddb/cache.cpp --- old/libkcddb-21.04.3/libkcddb/cache.cpp 2021-01-24 06:55:04.000000000 +0100 +++ new/libkcddb-21.08.0/libkcddb/cache.cpp 2021-05-17 03:27:01.000000000 +0200 @@ -44,8 +44,7 @@ void Cache::store(const TrackOffsetList& offsetList, const CDInfoList& list, const Config& c) { - foreach( const CDInfo &info, list ) - { + for (const CDInfo &info : list) { store(offsetList, info, c); } } @@ -58,11 +57,10 @@ // Some entries from freedb could contain several discids separated // by a ','. Store for each discid, but replace the discid line // so it doesn't happen again. - QStringList discids = discid.split(QLatin1Char( ',' )); + const QStringList discids = discid.split(QLatin1Char( ',' )); if (discids.count() > 2) { - foreach(const QString &newid, discids) - { + for (const QString &newid : discids) { CDInfo newInfo = info; newInfo.set(QLatin1String( "discid" ), newid); store(offsetList, newInfo, c); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkcddb-21.04.3/libkcddb/cddb.cpp new/libkcddb-21.08.0/libkcddb/cddb.cpp --- old/libkcddb-21.04.3/libkcddb/cddb.cpp 2021-01-24 06:55:04.000000000 +0100 +++ new/libkcddb-21.08.0/libkcddb/cddb.cpp 2021-05-17 03:27:01.000000000 +0200 @@ -116,8 +116,7 @@ for (QStringList::const_iterator cddbCacheDir = cddbCacheDirs.constBegin(); cddbCacheDir != cddbCacheDirs.constEnd(); ++cddbCacheDir) { - foreach(const QString &category, categories) - { + for (const QString &category : qAsConst(categories)) { QFile f( *cddbCacheDir + QLatin1Char( '/' ) + category + QLatin1Char( '/' ) + trackOffsetListToId(offsetList) ); if ( f.exists() && f.open(QIODevice::ReadOnly) ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkcddb-21.04.3/libkcddb/client.cpp new/libkcddb-21.08.0/libkcddb/client.cpp --- old/libkcddb-21.04.3/libkcddb/client.cpp 2021-01-24 06:55:04.000000000 +0100 +++ new/libkcddb-21.08.0/libkcddb/client.cpp 2021-05-17 03:27:01.000000000 +0200 @@ -111,7 +111,7 @@ if ( !d->cdInfoList.isEmpty() ) { if ( !blockingMode() ) - emit finished( Success ); + Q_EMIT finished( Success ); return Success; } @@ -231,7 +231,7 @@ if ( Success == r ) { - emit finished( r ); + Q_EMIT finished( r ); qDeleteAll( d->pendingLookups ); d->pendingLookups.clear(); } @@ -244,7 +244,7 @@ void Client::slotSubmitFinished( Result r ) { - emit finished( r ); + Q_EMIT finished( r ); d->cdInfoSubmit->deleteLater(); d->cdInfoSubmit=nullptr; @@ -347,7 +347,7 @@ } else { - emit finished( NoRecordFound ); + Q_EMIT finished( NoRecordFound ); return NoRecordFound; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkcddb-21.04.3/libkcddb/httplookup.cpp new/libkcddb-21.08.0/libkcddb/httplookup.cpp --- old/libkcddb-21.04.3/libkcddb/httplookup.cpp 2021-01-24 06:55:04.000000000 +0100 +++ new/libkcddb-21.08.0/libkcddb/httplookup.cpp 2021-05-17 03:27:01.000000000 +0200 @@ -102,7 +102,7 @@ case Success: if ( !block_ ) - emit queryReady(); + Q_EMIT queryReady(); break; case MultipleRecordFound: @@ -117,7 +117,7 @@ result_ = Success; if ( !block_ ) - emit queryReady(); + Q_EMIT queryReady(); break; } @@ -130,7 +130,7 @@ case ServerError: case NoRecordFound: if ( !block_ ) - emit queryReady(); + Q_EMIT queryReady(); return; break; @@ -158,7 +158,7 @@ } if ( !block_ ) - emit readReady(); + Q_EMIT readReady(); } return; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkcddb-21.04.3/libkcddb/musicbrainz/asyncmusicbrainzlookup.cpp new/libkcddb-21.08.0/libkcddb/musicbrainz/asyncmusicbrainzlookup.cpp --- old/libkcddb-21.04.3/libkcddb/musicbrainz/asyncmusicbrainzlookup.cpp 2021-01-24 06:55:04.000000000 +0100 +++ new/libkcddb-21.08.0/libkcddb/musicbrainz/asyncmusicbrainzlookup.cpp 2021-05-17 03:27:01.000000000 +0200 @@ -58,7 +58,7 @@ cdInfoList_ = m_lookupThread->m_lookupResponse; - emit finished(m_lookupThread->m_result); + Q_EMIT finished(m_lookupThread->m_result); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkcddb-21.04.3/po/zh_CN/kcmcddb.po new/libkcddb-21.08.0/po/zh_CN/kcmcddb.po --- old/libkcddb-21.04.3/po/zh_CN/kcmcddb.po 2021-07-06 07:20:43.000000000 +0200 +++ new/libkcddb-21.08.0/po/zh_CN/kcmcddb.po 2021-08-06 02:16:34.000000000 +0200 @@ -8,7 +8,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2020-12-30 02:41+0100\n" -"PO-Revision-Date: 2021-06-20 07:37\n" +"PO-Revision-Date: 2021-07-26 13:49\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkcddb-21.04.3/po/zh_CN/libkcddb.po new/libkcddb-21.08.0/po/zh_CN/libkcddb.po --- old/libkcddb-21.04.3/po/zh_CN/libkcddb.po 2021-07-06 07:20:43.000000000 +0200 +++ new/libkcddb-21.08.0/po/zh_CN/libkcddb.po 2021-08-06 02:16:34.000000000 +0200 @@ -10,7 +10,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2020-12-30 02:41+0100\n" -"PO-Revision-Date: 2021-06-20 07:37\n" +"PO-Revision-Date: 2021-07-26 13:49\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkcddb-21.04.3/tests/asynccddblookuptest.cpp new/libkcddb-21.08.0/tests/asynccddblookuptest.cpp --- old/libkcddb-21.04.3/tests/asynccddblookuptest.cpp 2021-01-24 06:55:04.000000000 +0100 +++ new/libkcddb-21.08.0/tests/asynccddblookuptest.cpp 2021-05-17 03:27:01.000000000 +0200 @@ -84,12 +84,11 @@ m_result = r; qDebug() << "AsyncCDDBLookupTest::slotResult: Got " << KCDDB::resultToString(r); - CDInfoList l = client_->lookupResponse(); + const CDInfoList l = client_->lookupResponse(); qDebug() << "AsyncCDDBLookupTest::slotResult: Item count: " << l.count(); - foreach(const CDInfo &i, l) - { + for (const CDInfo &i : l) { if (i.get(QString::fromUtf8("discid")) == QString::fromUtf8("a1107d0a") && i.get(Category) == QString::fromUtf8("jazz")) { qDebug() << "Found the CD"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkcddb-21.04.3/tests/asynchttplookuptest.cpp new/libkcddb-21.08.0/tests/asynchttplookuptest.cpp --- old/libkcddb-21.04.3/tests/asynchttplookuptest.cpp 2021-01-24 06:55:04.000000000 +0100 +++ new/libkcddb-21.08.0/tests/asynchttplookuptest.cpp 2021-05-17 03:27:01.000000000 +0200 @@ -85,12 +85,11 @@ m_result = r; qDebug() << "AsyncHTTPLookupTest::slotFinished: Got " << KCDDB::resultToString(r); - CDInfoList l = client_->lookupResponse(); + const CDInfoList l = client_->lookupResponse(); qDebug() << "AsyncHTTPLookupTest::slotFinished: Item count: " << l.count(); - foreach(const CDInfo &i, l) - { + for(const CDInfo &i : l) { if (i.get(QString::fromUtf8("discid")) == QVariant(QString::fromUtf8("a1107d0a")) && i.get(Category) == QVariant(QString::fromUtf8("jazz"))) { qDebug() << "Found the CD"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkcddb-21.04.3/tests/cachetest.cpp new/libkcddb-21.08.0/tests/cachetest.cpp --- old/libkcddb-21.04.3/tests/cachetest.cpp 2021-01-24 06:55:04.000000000 +0100 +++ new/libkcddb-21.08.0/tests/cachetest.cpp 2021-05-17 03:27:01.000000000 +0200 @@ -52,9 +52,8 @@ { Cache::store(m_list, info, m_client->config()); - CDInfoList results = Cache::lookup(m_list, m_client->config()); - foreach(const CDInfo &newInfo, results) - { + const CDInfoList results = Cache::lookup(m_list, m_client->config()); + for (const CDInfo &newInfo : results) { if (newInfo.get(QString::fromUtf8("source")) == source && newInfo.get(QString::fromUtf8("discid")).toString() == discid) { if (newInfo.get(Artist) != m_info.get(Artist))
