Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kparts for openSUSE:Factory checked in at 2021-06-16 20:34:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kparts (Old) and /work/SRC/openSUSE:Factory/.kparts.new.32437 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kparts" Wed Jun 16 20:34:06 2021 rev:90 rq:899755 version:5.83.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kparts/kparts.changes 2021-05-10 15:37:25.642029151 +0200 +++ /work/SRC/openSUSE:Factory/.kparts.new.32437/kparts.changes 2021-06-16 20:35:44.379212200 +0200 @@ -1,0 +2,12 @@ +Sat Jun 5 11:59:06 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 5.83.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.83.0 +- Changes since 5.82.0: + * Bump required CMake version to 3.16 + * Call ki18n_install() unconditionally + * Deprecate BrowserExtension::actionSlotMap() + +------------------------------------------------------------------- Old: ---- kparts-5.82.0.tar.xz kparts-5.82.0.tar.xz.sig New: ---- kparts-5.83.0.tar.xz kparts-5.83.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kparts.spec ++++++ --- /var/tmp/diff_new_pack.ZjtYdT/_old 2021-06-16 20:35:44.827212965 +0200 +++ /var/tmp/diff_new_pack.ZjtYdT/_new 2021-06-16 20:35:44.831212971 +0200 @@ -17,14 +17,14 @@ %define lname libKF5Parts5 -%define _tar_path 5.82 +%define _tar_path 5.83 # 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}')} %bcond_without lang Name: kparts -Version: 5.82.0 +Version: 5.83.0 Release: 0 Summary: Plugin framework for user interface components License: LGPL-2.1-or-later ++++++ kparts-5.82.0.tar.xz -> kparts-5.83.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.82.0/.gitignore new/kparts-5.83.0/.gitignore --- old/kparts-5.82.0/.gitignore 2021-05-01 14:38:18.000000000 +0200 +++ new/kparts-5.83.0/.gitignore 2021-06-05 11:22:29.000000000 +0200 @@ -25,3 +25,4 @@ .clangd .idea /cmake-build* +.cache diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.82.0/CMakeLists.txt new/kparts-5.83.0/CMakeLists.txt --- old/kparts-5.82.0/CMakeLists.txt 2021-05-01 14:38:18.000000000 +0200 +++ new/kparts-5.83.0/CMakeLists.txt 2021-06-05 11:22:29.000000000 +0200 @@ -1,11 +1,11 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.82.0") # handled by release scripts -set(KF_DEP_VERSION "5.82.0") # handled by release scripts +set(KF_VERSION "5.83.0") # handled by release scripts +set(KF_DEP_VERSION "5.83.0") # handled by release scripts project(KParts VERSION ${KF_VERSION}) include(FeatureSummary) -find_package(ECM 5.82.0 NO_MODULE) +find_package(ECM 5.83.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -53,14 +53,11 @@ add_subdirectory( autotests ) endif() add_definitions(-DTRANSLATION_DOMAIN=\"kparts5\") -if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po") - ki18n_install(po) -endif() +ki18n_install(po) add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f00) add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055100) add_definitions(-DKIOWIDGETS_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054600) # We need KRun for BrowserRun add_definitions(-DKCOREADDONS_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054000) # We need KAboutData::fromPluginMetaData -add_definitions(-DQT_NO_FOREACH) add_subdirectory( src ) add_subdirectory(templates) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.82.0/autotests/CMakeLists.txt new/kparts-5.83.0/autotests/CMakeLists.txt --- old/kparts-5.82.0/autotests/CMakeLists.txt 2021-05-01 14:38:18.000000000 +0200 +++ new/kparts-5.83.0/autotests/CMakeLists.txt 2021-06-05 11:22:29.000000000 +0200 @@ -5,10 +5,9 @@ ########### a KParts ############### -set(notepadpart_SRCS notepad.cpp) -qt5_add_resources(notepadpart_SRCS notepad.qrc) # don't use kcoreaddons_add_plugin here since we don't want to install it -add_library(notepadpart MODULE ${notepadpart_SRCS}) +add_library(notepadpart MODULE) +target_sources(notepadpart PRIVATE notepad.cpp notepad.qrc) # so we have to do the INSTALL_NAMESPACE thing by hand: set_target_properties(notepadpart PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/kf5/parts") kcoreaddons_desktop_to_json(notepadpart notepad.desktop) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.82.0/autotests/notepad.cpp new/kparts-5.83.0/autotests/notepad.cpp --- old/kparts-5.82.0/autotests/notepad.cpp 2021-05-01 14:38:18.000000000 +0200 +++ new/kparts-5.83.0/autotests/notepad.cpp 2021-06-05 11:22:29.000000000 +0200 @@ -32,7 +32,7 @@ QAction *searchReplace = new QAction(QStringLiteral("Search and replace"), this); actionCollection()->addAction(QStringLiteral("searchreplace"), searchReplace); - connect(searchReplace, SIGNAL(triggered()), this, SLOT(slotSearchReplace())); + connect(searchReplace, &QAction::triggered, this, &NotepadPart::slotSearchReplace); setXMLFile(QStringLiteral("notepadpart.rc")); // will be found in the qrc resource @@ -50,9 +50,9 @@ { m_edit->setReadOnly(!rw); if (rw) { - connect(m_edit, SIGNAL(textChanged()), this, SLOT(setModified())); + connect(m_edit, &QTextEdit::textChanged, this, QOverload<>::of(&KParts::ReadWritePart::setModified)); } else { - disconnect(m_edit, SIGNAL(textChanged()), this, SLOT(setModified())); + disconnect(m_edit, &QTextEdit::textChanged, this, QOverload<>::of(&KParts::ReadWritePart::setModified)); } ReadWritePart::setReadWrite(rw); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.82.0/po/vi/kparts5.po new/kparts-5.83.0/po/vi/kparts5.po --- old/kparts-5.82.0/po/vi/kparts5.po 2021-05-01 14:38:18.000000000 +0200 +++ new/kparts-5.83.0/po/vi/kparts5.po 2021-06-05 11:22:29.000000000 +0200 @@ -4,13 +4,13 @@ # Clytie Siddall <[email protected]>, 2006-2007. # Ho??ng ?????c Hi???u <[email protected]>, 2008, 2011. # L?? Ho??ng Ph????ng <[email protected]>, 2011, 2012. -# Phu Hung Nguyen <[email protected]>, 2020. +# Phu Hung Nguyen <[email protected]>, 2020, 2021. msgid "" msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-02-28 02:23+0100\n" -"PO-Revision-Date: 2020-10-25 09:51+0100\n" +"PO-Revision-Date: 2021-05-20 17:24+0200\n" "Last-Translator: Phu Hung Nguyen <[email protected]>\n" "Language-Team: Vietnamese <[email protected]>\n" "Language: vi\n" @@ -18,19 +18,19 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Lokalize 19.12.2\n" +"X-Generator: Lokalize 20.08.1\n" #, kde-format msgctxt "NAME OF TRANSLATORS" msgid "Your names" -msgstr "Clytie Siddall,Ho??ng ?????c Hi???u,L?? Ho??ng Ph????ng,Nguy???n H??ng Ph??" +msgstr "Nguy???n H??ng Ph??,L?? Ho??ng Ph????ng,Ho??ng ?????c Hi???u,Clytie Siddall" #, kde-format msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" msgstr "" -"[email protected],[email protected],[email protected]," -"[email protected]" +"[email protected],[email protected],[email protected]," +"[email protected]" #: browserextension.cpp:219 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.82.0/po/zh_CN/kparts5.po new/kparts-5.83.0/po/zh_CN/kparts5.po --- old/kparts-5.82.0/po/zh_CN/kparts5.po 2021-05-01 14:38:18.000000000 +0200 +++ new/kparts-5.83.0/po/zh_CN/kparts5.po 2021-06-05 11:22:29.000000000 +0200 @@ -15,7 +15,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-02-28 02:23+0100\n" -"PO-Revision-Date: 2021-04-24 15:42\n" +"PO-Revision-Date: 2021-06-03 16:05\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.82.0/src/CMakeLists.txt new/kparts-5.83.0/src/CMakeLists.txt --- old/kparts-5.82.0/src/CMakeLists.txt 2021-05-01 14:38:18.000000000 +0200 +++ new/kparts-5.83.0/src/CMakeLists.txt 2021-06-05 11:22:29.000000000 +0200 @@ -1,4 +1,7 @@ -set(KParts_LIB_SRCS +add_library(KF5Parts SHARED) +add_library(KF5::Parts ALIAS KF5Parts) + +target_sources(KF5Parts PRIVATE partbase.cpp part.cpp partmetadatautil_p.cpp @@ -76,7 +79,7 @@ DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KParts/KParts COMPONENT Devel) -ecm_qt_declare_logging_category(KParts_LIB_SRCS +ecm_qt_declare_logging_category(KF5Parts HEADER kparts_logging.h IDENTIFIER KPARTSLOG CATEGORY_NAME kf.parts @@ -84,21 +87,20 @@ EXPORT KPARTSLOG ) -add_library(KF5Parts ${KParts_LIB_SRCS}) -add_library(KF5::Parts ALIAS KF5Parts) ecm_generate_export_header(KF5Parts EXPORT_FILE_NAME ${KParts_BINARY_DIR}/kparts/kparts_export.h BASE_NAME KParts GROUP_BASE_NAME KF VERSION ${KF_VERSION} DEPRECATED_BASE_VERSION 0 - DEPRECATION_VERSIONS 3.0 4.4 5.0 5.72 5.77 5.78 5.80 5.81 5.82 + DEPRECATION_VERSIONS 3.0 4.4 5.0 5.72 5.77 5.78 5.80 5.81 5.82 5.83 EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT} ) -set(KParts_BUILD_INCLUDE_DIRS ${KParts_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}) -target_include_directories(KF5Parts PUBLIC "$<BUILD_INTERFACE:${KParts_BUILD_INCLUDE_DIRS}>") -target_include_directories(KF5Parts INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KParts>" ) +target_include_directories(KF5Parts + PUBLIC "$<BUILD_INTERFACE:${KParts_BINARY_DIR}>" + INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KParts>" +) target_link_libraries(KF5Parts PUBLIC KF5::KIOWidgets #browserrun.h uses krun.h KF5::XmlGui # essential to the technology @@ -107,7 +109,7 @@ KF5::IconThemes #only used by KPart::iconLoader() ) -set_target_properties(KF5Parts PROPERTIES VERSION ${KPARTS_VERSION_STRING} +set_target_properties(KF5Parts PROPERTIES VERSION ${KPARTS_VERSION} SOVERSION ${KPARTS_SOVERSION} EXPORT_NAME Parts ) @@ -152,7 +154,8 @@ KF5XmlGui_QCH KF5TextWidgets_QCH INCLUDE_DIRS - ${KParts_BUILD_INCLUDE_DIRS} + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} BLANK_MACROS KPARTS_EXPORT KPARTS_DEPRECATED diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.82.0/src/browserextension.cpp new/kparts-5.83.0/src/browserextension.cpp --- old/kparts-5.82.0/src/browserextension.cpp 2021-05-01 14:38:18.000000000 +0200 +++ new/kparts-5.83.0/src/browserextension.cpp 2021-06-05 11:22:29.000000000 +0200 @@ -298,11 +298,12 @@ return QString(); } -// for compatibility +#if KPARTS_BUILD_DEPRECATED_SINCE(5, 83) BrowserExtension::ActionSlotMap BrowserExtension::actionSlotMap() { return *actionSlotMapPtr(); } +#endif BrowserExtension::ActionSlotMap *BrowserExtension::actionSlotMapPtr() { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.82.0/src/browserextension.h new/kparts-5.83.0/src/browserextension.h --- old/kparts-5.82.0/src/browserextension.h 2021-05-01 14:38:18.000000000 +0200 +++ new/kparts-5.83.0/src/browserextension.h 2021-06-05 11:22:29.000000000 +0200 @@ -87,7 +87,7 @@ * @li @p reparseConfiguration : Re-read configuration and apply it. * @li @p disableScrolling: no scrollbars */ -class KPARTS_EXPORT BrowserExtension : public QObject +class KPARTS_EXPORT BrowserExtension : public QObject // TODO KF6, rename class and header to NavigationExtension. See https://phabricator.kde.org/T12224 { Q_OBJECT Q_PROPERTY(bool urlDropHandling READ isURLDropHandlingEnabled WRITE setURLDropHandlingEnabled) @@ -213,6 +213,8 @@ QString actionText(const char *name) const; typedef QMap<QByteArray, QByteArray> ActionSlotMap; + +#if KPARTS_ENABLE_DEPRECATED_SINCE(5, 83) /** * Returns a map containing the action names as keys and corresponding * SLOT()'ified method names as data entries. @@ -241,13 +243,15 @@ * * (where "mapIterator" is your ActionSlotMap iterator) */ + KPARTS_DEPRECATED_VERSION(5, 83, "Use actionSlotMapPtr instead") static ActionSlotMap actionSlotMap(); +#endif /** * @return a pointer to the static action-slot map. Preferred method to get it. * The map is created if it doesn't exist yet */ - static ActionSlotMap *actionSlotMapPtr(); + static ActionSlotMap *actionSlotMapPtr(); // TODO KF6 Rename to actionSlotMap /** * Queries @p obj for a child object which inherits from this diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.82.0/src/kde_terminal_interface.h new/kparts-5.83.0/src/kde_terminal_interface.h --- old/kparts-5.82.0/src/kde_terminal_interface.h 2021-05-01 14:38:18.000000000 +0200 +++ new/kparts-5.83.0/src/kde_terminal_interface.h 2021-06-05 11:22:29.000000000 +0200 @@ -29,42 +29,40 @@ * * Use it like this: * \code - * //query the .desktop file to get service information about konsolepart + * // Query the .desktop file to get service information about konsolepart * KService::Ptr service = KService::serviceByDesktopName("konsolepart"); * - * if (!service) - * { + * if (!service) { * QMessageBox::critical(this, tr("Konsole not installed"), tr("Please install the kde konsole and try again!"), QMessageBox::Ok); * return ; * } * - * // create one instance of konsolepart - * KParts::ReadOnlyPart* p = service->createInstance<KParts::ReadOnlyPart>(parent, parentWidget, QVariantList()); + * // Create one instance of konsolepart + * KParts::ReadOnlyPart *part = service->createInstance<KParts::ReadOnlyPart>(parent, parentWidget, QVariantList()); * - * if (!p) - * { + * if (!part) { * return; * } * - * // cast the konsolepart to the TerminalInterface.. - * TerminalInterface* t = qobject_cast<TerminalInterface*>(p); + * // Cast the konsolepart to the TerminalInterface.. + * TerminalInterface *terminalIface = qobject_cast<TerminalInterface *>(part); * - * if (!t) - * { + * if (!terminalIface) { * return; * } * - * // now use the interface in all sorts of ways, e.g. - * // t->showShellInDir( QDir::home().path() ); - * // or: - * // QStringList l; - * // l.append( "python" ); - * // t->startProgram( QString::fromUtf8( "/usr/bin/python" ), l); - * // or connect to one of the signals. Connect to the Part object, - * // not to the TerminalInterface, since the latter is no QObject, - * // and as such cannot have signals..: - * // connect(p, SIGNAL(currentDirectoryChanged(QString)), - * // this, SLOT(currentDirectoryChanged(QString))); + * // Now use the interface in all sorts of ways, e.g. + * // terminalIface->showShellInDir(QDir::home().path()); + * // Or: + * // QStringList list; + * // list.append("python"); + * // terminalIface->startProgram( QString::fromUtf8( "/usr/bin/python" ), list); + * // Or connect to one of the signals. Connect to the Part object, + * // not to the TerminalInterface, since the latter is not a QObject, + * // and as such does not have signals..: + * connect(part, &KParts::ReadOnlyPart::currentDirectoryChanged, this, [this](const QString &dirPath) { + * currentDirectoryChanged(dirPath); + * }); * // etc. * * \endcode diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.82.0/src/readonlypart.cpp new/kparts-5.83.0/src/readonlypart.cpp --- old/kparts-5.82.0/src/readonlypart.cpp 2021-05-01 14:38:18.000000000 +0200 +++ new/kparts-5.83.0/src/readonlypart.cpp 2021-06-05 11:22:29.000000000 +0200 @@ -144,9 +144,9 @@ KIO::JobFlags flags = d->m_showProgressInfo ? KIO::DefaultFlags : KIO::HideProgressInfo; d->m_statJob = KIO::mostLocalUrl(d->m_url, flags); KJobWidgets::setWindow(d->m_statJob, widget()); - // clang-format off - connect(d->m_statJob, SIGNAL(result(KJob*)), this, SLOT(_k_slotStatJobFinished(KJob*))); - // clang-format on + connect(d->m_statJob, &KJob::result, this, [d](KJob *job) { + d->slotStatJobFinished(job); + }); return true; } else { d->openRemoteFile(); @@ -210,11 +210,12 @@ m_job = KIO::file_copy(m_url, destURL, 0600, flags); KJobWidgets::setWindow(m_job, q->widget()); Q_EMIT q->started(m_job); - // clang-format off - QObject::connect(m_job, SIGNAL(result(KJob*)), q, SLOT(_k_slotJobFinished(KJob*))); - // clang-format on + + QObject::connect(m_job, &KJob::result, q, [this](KJob *job) { + slotJobFinished(job); + }); QObject::connect(m_job, &KIO::FileCopyJob::mimeTypeFound, q, [this](KIO::Job *job, const QString &mimeType) { - _k_slotGotMimeType(job, mimeType); + slotGotMimeType(job, mimeType); }); } @@ -255,7 +256,7 @@ return true; } -void ReadOnlyPartPrivate::_k_slotStatJobFinished(KJob *job) +void ReadOnlyPartPrivate::slotStatJobFinished(KJob *job) { Q_ASSERT(job == m_statJob); m_statJob = nullptr; @@ -274,7 +275,7 @@ openRemoteFile(); } -void ReadOnlyPartPrivate::_k_slotJobFinished(KJob *job) +void ReadOnlyPartPrivate::slotJobFinished(KJob *job) { Q_Q(ReadOnlyPart); @@ -292,7 +293,7 @@ } } -void ReadOnlyPartPrivate::_k_slotGotMimeType(KIO::Job *job, const QString &mime) +void ReadOnlyPartPrivate::slotGotMimeType(KIO::Job *job, const QString &mime) { // qDebug() << mime; Q_ASSERT(job == m_job); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.82.0/src/readonlypart.h new/kparts-5.83.0/src/readonlypart.h --- old/kparts-5.82.0/src/readonlypart.h 2021-05-01 14:38:18.000000000 +0200 +++ new/kparts-5.83.0/src/readonlypart.h 2021-06-05 11:22:29.000000000 +0200 @@ -333,9 +333,6 @@ ReadOnlyPart(ReadOnlyPartPrivate &dd, QObject *parent); private: - Q_PRIVATE_SLOT(d_func(), void _k_slotJobFinished(KJob *job)) - Q_PRIVATE_SLOT(d_func(), void _k_slotStatJobFinished(KJob *)) - Q_DISABLE_COPY(ReadOnlyPart) }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.82.0/src/readonlypart_p.h new/kparts-5.83.0/src/readonlypart_p.h --- old/kparts-5.82.0/src/readonlypart_p.h 2021-05-01 14:38:18.000000000 +0200 +++ new/kparts-5.83.0/src/readonlypart_p.h 2021-06-05 11:22:29.000000000 +0200 @@ -45,9 +45,9 @@ { } - void _k_slotJobFinished(KJob *job); - void _k_slotStatJobFinished(KJob *job); - void _k_slotGotMimeType(KIO::Job *job, const QString &mime); + void slotJobFinished(KJob *job); + void slotStatJobFinished(KJob *job); + void slotGotMimeType(KIO::Job *job, const QString &mime); bool openLocalFile(); void openRemoteFile(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.82.0/src/readwritepart.cpp new/kparts-5.83.0/src/readwritepart.cpp --- old/kparts-5.82.0/src/readwritepart.cpp 2021-05-01 14:38:18.000000000 +0200 +++ new/kparts-5.83.0/src/readwritepart.cpp 2021-06-05 11:22:29.000000000 +0200 @@ -251,14 +251,16 @@ } d->m_uploadJob = KIO::file_move(uploadUrl, d->m_url, -1, KIO::Overwrite); KJobWidgets::setWindow(d->m_uploadJob, widget()); - // clang-format off - connect(d->m_uploadJob, SIGNAL(result(KJob*)), this, SLOT(_k_slotUploadFinished(KJob*))); - // clang-format on + + connect(d->m_uploadJob, &KJob::result, this, [d](KJob *job) { + d->slotUploadFinished(job); + }); + return true; } } -void ReadWritePartPrivate::_k_slotUploadFinished(KJob *) +void ReadWritePartPrivate::slotUploadFinished(KJob *) { Q_Q(ReadWritePart); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.82.0/src/readwritepart.h new/kparts-5.83.0/src/readwritepart.h --- old/kparts-5.82.0/src/readwritepart.h 2021-05-01 14:38:18.000000000 +0200 +++ new/kparts-5.83.0/src/readwritepart.h 2021-06-05 11:22:29.000000000 +0200 @@ -169,8 +169,6 @@ virtual bool saveToUrl(); private: - Q_PRIVATE_SLOT(d_func(), void _k_slotUploadFinished(KJob *job)) - Q_DISABLE_COPY(ReadWritePart) }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.82.0/src/readwritepart_p.h new/kparts-5.83.0/src/readwritepart_p.h --- old/kparts-5.82.0/src/readwritepart_p.h 2021-05-01 14:38:18.000000000 +0200 +++ new/kparts-5.83.0/src/readwritepart_p.h 2021-06-05 11:22:29.000000000 +0200 @@ -29,7 +29,7 @@ m_bClosing = false; } - void _k_slotUploadFinished(KJob *job); + void slotUploadFinished(KJob *job); void prepareSaving(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.82.0/templates/kpartsapp/CMakeLists.txt new/kparts-5.83.0/templates/kpartsapp/CMakeLists.txt --- old/kparts-5.82.0/templates/kpartsapp/CMakeLists.txt 2021-05-01 14:38:18.000000000 +0200 +++ new/kparts-5.83.0/templates/kpartsapp/CMakeLists.txt 2021-06-05 11:22:29.000000000 +0200 @@ -1,8 +1,8 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.16) project(%{APPNAMELC}) -set(REQUIRED_ECM_VERSION "5.23.0") +set(REQUIRED_ECM_VERSION "5.83.0") find_package(ECM ${REQUIRED_ECM_VERSION} REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) @@ -12,7 +12,7 @@ include(ECMInstallIcons) include(FeatureSummary) -set(QT_MIN_VERSION "5.6.0") +set(QT_MIN_VERSION "5.15.0") find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Widgets ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.82.0/templates/kpartsapp/src/part/CMakeLists.txt new/kparts-5.83.0/templates/kpartsapp/src/part/CMakeLists.txt --- old/kparts-5.82.0/templates/kpartsapp/src/part/CMakeLists.txt 2021-05-01 14:38:18.000000000 +0200 +++ new/kparts-5.83.0/templates/kpartsapp/src/part/CMakeLists.txt 2021-06-05 11:22:29.000000000 +0200 @@ -1,14 +1,13 @@ add_definitions(-DTRANSLATION_DOMAIN=\"%{APPNAMELC}part\") -set(%{APPNAMELC}_PART_SRCS - %{APPNAMELC}part.cpp -) +add_library(%{APPNAMELC}part MODULE) -qt5_add_resources(%{APPNAMELC}_PART_SRCS +target_sources(%{APPNAMELC}part PRIVATE + %{APPNAMELC}part.cpp + # handled by CMake's AUTORCC, as set by KDECMakeSettings %{APPNAMELC}part.qrc ) -add_library(%{APPNAMELC}part MODULE ${%{APPNAMELC}_PART_SRCS}) kcoreaddons_desktop_to_json(%{APPNAMELC}part %{APPNAMELC}part.desktop) target_link_libraries(%{APPNAMELC}part diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.82.0/templates/kpartsapp/src/shell/CMakeLists.txt new/kparts-5.83.0/templates/kpartsapp/src/shell/CMakeLists.txt --- old/kparts-5.82.0/templates/kpartsapp/src/shell/CMakeLists.txt 2021-05-01 14:38:18.000000000 +0200 +++ new/kparts-5.83.0/templates/kpartsapp/src/shell/CMakeLists.txt 2021-06-05 11:22:29.000000000 +0200 @@ -1,14 +1,12 @@ -set(%{APPNAMELC}_SRCS - main.cpp - %{APPNAMELC}shell.cpp -) +add_executable(%{APPNAMELC}) -qt5_add_resources(%{APPNAMELC}_SRCS +target_sources(%{APPNAMELC} PRIVATE + main.cpp + %{APPNAMELC}shell.cpp + # handled by CMake's AUTORCC, as set by KDECMakeSettings %{APPNAMELC}.qrc ) -add_executable(%{APPNAMELC} ${%{APPNAMELC}_SRCS}) - target_link_libraries(%{APPNAMELC} KF5::I18n KF5::Parts diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.82.0/tests/CMakeLists.txt new/kparts-5.83.0/tests/CMakeLists.txt --- old/kparts-5.82.0/tests/CMakeLists.txt 2021-05-01 14:38:18.000000000 +0200 +++ new/kparts-5.83.0/tests/CMakeLists.txt 2021-06-05 11:22:29.000000000 +0200 @@ -1,27 +1,26 @@ find_package(Qt5Test ${REQUIRED_QT_VERSION} REQUIRED) set_package_properties(Qt5Test PROPERTIES PURPOSE "Required for tests") -set(PARTS_TEST_LIBRARY_DEPENDENCIES Qt5::Test KF5::Parts KF5::CoreAddons KF5::I18n KF5::XmlGui KF5::KIOCore) include(ECMMarkAsTest) -set(partstest_SRCS - parts.cpp +add_library(parts_test_interface INTERFACE) +target_link_libraries(parts_test_interface INTERFACE + Qt5::Test KF5::Parts KF5::CoreAddons KF5::I18n KF5::XmlGui KF5::KIOCore ) - -add_executable(kpartstest testmainwindow.cpp ${partstest_SRCS}) +add_executable(kpartstest testmainwindow.cpp parts.cpp) ecm_mark_as_test(kpartstest) -target_link_libraries(kpartstest ${PARTS_TEST_LIBRARY_DEPENDENCIES}) +target_link_libraries(kpartstest parts_test_interface) -add_executable(normalktmtest normalktm.cpp ${partstest_SRCS}) +add_executable(normalktmtest normalktm.cpp parts.cpp) ecm_mark_as_test(normalktmtest) -target_link_libraries(normalktmtest ${PARTS_TEST_LIBRARY_DEPENDENCIES}) +target_link_libraries(normalktmtest parts_test_interface) ########### next target ############### add_library(spellcheckplugin MODULE plugin_spellcheck.cpp) -target_link_libraries(spellcheckplugin ${PARTS_TEST_LIBRARY_DEPENDENCIES} ) +target_link_libraries(spellcheckplugin parts_test_interface ) install(TARGETS spellcheckplugin DESTINATION ${KDE_INSTALL_PLUGINDIR} ) ########### unit tests ############### @@ -30,7 +29,7 @@ FOREACH(_testname ${ARGN}) add_executable(${_testname} ${_testname}.cpp) ecm_mark_as_test(${_testname}) - target_link_libraries(${_testname} ${PARTS_TEST_LIBRARY_DEPENDENCIES}) + target_link_libraries(${_testname} parts_test_interface) ENDFOREACH(_testname) ENDMACRO(KPARTS_EXECUTABLE_TESTS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.82.0/tests/normalktm.cpp new/kparts-5.83.0/tests/normalktm.cpp --- old/kparts-5.82.0/tests/normalktm.cpp 2021-05-01 14:38:18.000000000 +0200 +++ new/kparts-5.83.0/tests/normalktm.cpp 2021-06-05 11:22:29.000000000 +0200 @@ -40,29 +40,29 @@ KActionCollection *coll = actionCollection(); QAction *paLocal = new QAction(QStringLiteral("&View local file"), this); coll->addAction(QStringLiteral("open_local_file"), paLocal); - connect(paLocal, SIGNAL(triggered()), this, SLOT(slotFileOpen())); + connect(paLocal, &QAction::triggered, this, &TestMainWindow::slotFileOpen); // No XML: we need to add our actions to the menus ourselves pFile->addAction(paLocal); QAction *paRemote = new QAction(QStringLiteral("&View remote file"), this); coll->addAction(QStringLiteral("open_remote_file"), paRemote); - connect(paRemote, SIGNAL(triggered()), this, SLOT(slotFileOpenRemote())); + connect(paRemote, &QAction::triggered, this, &TestMainWindow::slotFileOpenRemote); pFile->addAction(paRemote); m_paEditFile = new QAction(QStringLiteral("&Edit file"), this); coll->addAction(QStringLiteral("edit_file"), m_paEditFile); - connect(m_paEditFile, SIGNAL(triggered()), this, SLOT(slotFileEdit())); + connect(m_paEditFile, &QAction::triggered, this, &TestMainWindow::slotFileEdit); pFile->addAction(m_paEditFile); m_paCloseEditor = new QAction(QStringLiteral("&Close file editor"), this); coll->addAction(QStringLiteral("close_editor"), m_paCloseEditor); - connect(m_paCloseEditor, SIGNAL(triggered()), this, SLOT(slotFileCloseEditor())); + connect(m_paCloseEditor, &QAction::triggered, this, &TestMainWindow::slotFileCloseEditor); m_paCloseEditor->setEnabled(false); pFile->addAction(m_paCloseEditor); QAction *paQuit = new QAction(QStringLiteral("&Quit"), this); coll->addAction(QStringLiteral("shell_quit"), paQuit); - connect(paQuit, SIGNAL(triggered()), this, SLOT(close())); + connect(paQuit, &QAction::triggered, this, &TestMainWindow::close); paQuit->setIcon(QIcon::fromTheme(QStringLiteral("application-exit"))); pFile->addAction(paQuit); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.82.0/tests/parts.cpp new/kparts-5.83.0/tests/parts.cpp --- old/kparts-5.82.0/tests/parts.cpp 2021-05-01 14:38:18.000000000 +0200 +++ new/kparts-5.83.0/tests/parts.cpp 2021-06-05 11:22:29.000000000 +0200 @@ -47,14 +47,14 @@ QAction *testAction = actionCollection()->addAction(QStringLiteral("p1_blah")); testAction->setText(QStringLiteral("Part1's action")); actionCollection()->setDefaultShortcut(testAction, Qt::CTRL | Qt::Key_B); - connect(testAction, SIGNAL(triggered()), this, SLOT(slotBlah())); + connect(testAction, &QAction::triggered, this, &Part1::slotBlah); KActionMenu *menu = new KActionMenu(QIcon::fromTheme(QStringLiteral("mail_forward")), QStringLiteral("Foo"), this); actionCollection()->addAction(QStringLiteral("p1_foo"), menu); QAction *mailForward = new QAction(QIcon::fromTheme(QStringLiteral("mail_forward")), QStringLiteral("Bar"), this); actionCollection()->setDefaultShortcut(mailForward, Qt::CTRL | Qt::Key_F); - connect(mailForward, SIGNAL(triggered()), this, SLOT(slotFooBar())); + connect(mailForward, &QAction::triggered, this, &Part1::slotFooBar); actionCollection()->addAction(QStringLiteral("p1_foo_bar"), mailForward); menu->addAction(mailForward); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.82.0/tests/partviewer.cpp new/kparts-5.83.0/tests/partviewer.cpp --- old/kparts-5.82.0/tests/partviewer.cpp 2021-05-01 14:38:18.000000000 +0200 +++ new/kparts-5.83.0/tests/partviewer.cpp 2021-06-05 11:22:29.000000000 +0200 @@ -27,11 +27,11 @@ QAction *paOpen = new QAction(QIcon::fromTheme(QStringLiteral("document-open")), QStringLiteral("&Open file"), this); actionCollection()->addAction(QStringLiteral("file_open"), paOpen); - connect(paOpen, SIGNAL(triggered()), this, SLOT(slotFileOpen())); + connect(paOpen, &QAction::triggered, this, &PartViewer::slotFileOpen); QAction *paQuit = new QAction(QIcon::fromTheme(QStringLiteral("application-exit")), QStringLiteral("&Quit"), this); actionCollection()->addAction(QStringLiteral("file_quit"), paQuit); - connect(paQuit, SIGNAL(triggered()), this, SLOT(close())); + connect(paQuit, &QAction::triggered, this, &PartViewer::close); m_part = nullptr; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.82.0/tests/plugin_spellcheck.cpp new/kparts-5.83.0/tests/plugin_spellcheck.cpp --- old/kparts-5.82.0/tests/plugin_spellcheck.cpp 2021-05-01 14:38:18.000000000 +0200 +++ new/kparts-5.83.0/tests/plugin_spellcheck.cpp 2021-06-05 11:22:29.000000000 +0200 @@ -20,7 +20,7 @@ { QAction *act = new QAction(QStringLiteral("&Select current line (plugin)"), this); actionCollection()->addAction(QStringLiteral("spellcheck"), act); - connect(act, SIGNAL(triggered()), this, SLOT(slotSpellCheck())); + connect(act, &QAction::triggered, this, &PluginSpellCheck::slotSpellCheck); } PluginSpellCheck::~PluginSpellCheck() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.82.0/tests/terminal_test.cpp new/kparts-5.83.0/tests/terminal_test.cpp --- old/kparts-5.82.0/tests/terminal_test.cpp 2021-05-01 14:38:18.000000000 +0200 +++ new/kparts-5.83.0/tests/terminal_test.cpp 2021-06-05 11:22:29.000000000 +0200 @@ -29,7 +29,7 @@ TerminalInterface *interface = qobject_cast<TerminalInterface *>(part); interface->showShellInDir(QDir::home().path()); - connect(part, SIGNAL(destroyed()), this, SLOT(deleteLater())); + connect(part, &QObject::destroyed, this, &QObject::deleteLater); } int main(int argc, char **argv) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-5.82.0/tests/testmainwindow.cpp new/kparts-5.83.0/tests/testmainwindow.cpp --- old/kparts-5.82.0/tests/testmainwindow.cpp 2021-05-01 14:38:18.000000000 +0200 +++ new/kparts-5.83.0/tests/testmainwindow.cpp 2021-06-05 11:22:29.000000000 +0200 @@ -32,9 +32,7 @@ m_manager = new KParts::PartManager(this); // When the manager says the active part changes, the builder updates (recreates) the GUI - // clang-format off - connect(m_manager, SIGNAL(activePartChanged(KParts::Part*)), this, SLOT(createGUI(KParts::Part*))); - // clang-format on + connect(m_manager, &KParts::PartManager::activePartChanged, this, &TestMainWindow::createGUI); // We can do this "switch active part" because we have a splitter with // two items in it. @@ -48,28 +46,34 @@ QAction *paOpen = new QAction(QStringLiteral("&View local file"), this); coll->addAction(QStringLiteral("open_local_file"), paOpen); - connect(paOpen, SIGNAL(triggered()), this, SLOT(slotFileOpen())); + connect(paOpen, &QAction::triggered, this, &TestMainWindow::slotFileOpen); QAction *paOpenRemote = new QAction(QStringLiteral("&View remote file"), this); coll->addAction(QStringLiteral("open_remote_file"), paOpenRemote); - connect(paOpenRemote, SIGNAL(triggered()), this, SLOT(slotFileOpenRemote())); + connect(paOpenRemote, &QAction::triggered, this, &TestMainWindow::slotFileOpenRemote); m_paEditFile = new QAction(QStringLiteral("&Edit file"), this); coll->addAction(QStringLiteral("edit_file"), m_paEditFile); - connect(m_paEditFile, SIGNAL(triggered()), this, SLOT(slotFileEdit())); + connect(m_paEditFile, &QAction::triggered, this, &TestMainWindow::slotFileEdit); m_paCloseEditor = new QAction(QStringLiteral("&Close file editor"), this); coll->addAction(QStringLiteral("close_editor"), m_paCloseEditor); - connect(m_paCloseEditor, SIGNAL(triggered()), this, SLOT(slotFileCloseEditor())); + connect(m_paCloseEditor, &QAction::triggered, this, &TestMainWindow::slotFileCloseEditor); m_paCloseEditor->setEnabled(false); QAction *paQuit = new QAction(QStringLiteral("&Quit"), this); coll->addAction(QStringLiteral("shell_quit"), paQuit); - connect(paQuit, SIGNAL(triggered()), this, SLOT(close())); + connect(paQuit, &QAction::triggered, this, &TestMainWindow::close); paQuit->setIcon(QIcon::fromTheme(QStringLiteral("application-exit"))); // (void)new QAction( "Yet another menu item", coll, "shell_yami" ); // (void)new QAction( "Yet another submenu item", coll, "shell_yasmi" ); - KStandardAction::configureToolbars(this, SLOT(configureToolbars()), actionCollection()); - KStandardAction::keyBindings(guiFactory(), SLOT(configureShortcuts()), actionCollection()); + KStandardAction::configureToolbars(this, &KParts::MainWindow::configureToolbars, actionCollection()); + + // KXMLGUIFactory::configureShortcuts(bool bAllowLetterShortcuts = true, bool bSaveSettings = true) + // can't be connected directly to the QAction::triggered(bool) signal + auto configureShortcutsSlot = [this]() { + guiFactory()->configureShortcuts(); + }; + KStandardAction::keyBindings(guiFactory(), configureShortcutsSlot, actionCollection()); setCentralWidget(m_splitter); m_splitter->setMinimumSize(400, 300);
