Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kwallet for openSUSE:Factory checked in at 2021-06-16 20:34:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kwallet (Old) and /work/SRC/openSUSE:Factory/.kwallet.new.32437 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kwallet" Wed Jun 16 20:34:13 2021 rev:96 rq:899766 version:5.83.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kwallet/kwallet.changes 2021-05-10 15:37:37.573982945 +0200 +++ /work/SRC/openSUSE:Factory/.kwallet.new.32437/kwallet.changes 2021-06-16 20:35:52.915226767 +0200 @@ -1,0 +2,11 @@ +Sat Jun 5 11:59:15 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr> + +- 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 + +------------------------------------------------------------------- Old: ---- kwallet-5.82.0.tar.xz kwallet-5.82.0.tar.xz.sig New: ---- kwallet-5.83.0.tar.xz kwallet-5.83.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kwallet.spec ++++++ --- /var/tmp/diff_new_pack.iKe0SJ/_old 2021-06-16 20:35:53.319227456 +0200 +++ /var/tmp/diff_new_pack.iKe0SJ/_new 2021-06-16 20:35:53.319227456 +0200 @@ -17,14 +17,14 @@ %define lname libKF5Wallet5 -%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: kwallet -Version: 5.82.0 +Version: 5.83.0 Release: 0 Summary: Safe desktop-wide storage for passwords License: LGPL-2.1-or-later ++++++ kwallet-5.82.0.tar.xz -> kwallet-5.83.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.82.0/.gitignore new/kwallet-5.83.0/.gitignore --- old/kwallet-5.82.0/.gitignore 2021-05-01 14:40:57.000000000 +0200 +++ new/kwallet-5.83.0/.gitignore 2021-06-05 11:25:07.000000000 +0200 @@ -25,3 +25,4 @@ .clangd .idea /cmake-build* +.cache diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.82.0/CMakeLists.txt new/kwallet-5.83.0/CMakeLists.txt --- old/kwallet-5.82.0/CMakeLists.txt 2021-05-01 14:40:57.000000000 +0200 +++ new/kwallet-5.83.0/CMakeLists.txt 2021-06-05 11:25:07.000000000 +0200 @@ -1,12 +1,12 @@ -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(KWallet VERSION ${KF_VERSION}) set(CMAKE_EXPORT_COMPILE_COMMANDS 1) 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) @@ -39,11 +39,8 @@ add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f00) add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055100) -add_definitions(-DQT_NO_FOREACH) add_definitions(-DTRANSLATION_DOMAIN=\"kwalletd5\") -if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po") - ki18n_install(po) -endif() +ki18n_install(po) add_subdirectory(src) if (BUILD_TESTING) add_subdirectory(autotests) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.82.0/examples/asynchronous_app/CMakeLists.txt new/kwallet-5.83.0/examples/asynchronous_app/CMakeLists.txt --- old/kwallet-5.82.0/examples/asynchronous_app/CMakeLists.txt 2021-05-01 14:40:57.000000000 +0200 +++ new/kwallet-5.83.0/examples/asynchronous_app/CMakeLists.txt 2021-06-05 11:25:07.000000000 +0200 @@ -1,6 +1,4 @@ -set(SRCS main.cpp dialog.cpp) - -add_executable(kwallet-example-asynchronous ${SRCS}) +add_executable(kwallet-example-asynchronous main.cpp dialog.cpp) target_link_libraries(kwallet-example-asynchronous KF5::Wallet Qt5::Widgets) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.82.0/po/zh_CN/kwallet-query.po new/kwallet-5.83.0/po/zh_CN/kwallet-query.po --- old/kwallet-5.82.0/po/zh_CN/kwallet-query.po 2021-05-01 14:40:57.000000000 +0200 +++ new/kwallet-5.83.0/po/zh_CN/kwallet-query.po 2021-06-05 11:25:07.000000000 +0200 @@ -7,7 +7,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-03-02 02:37+0100\n" -"PO-Revision-Date: 2021-04-24 15:43\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/kwallet-5.82.0/po/zh_CN/kwalletd5.po new/kwallet-5.83.0/po/zh_CN/kwalletd5.po --- old/kwallet-5.82.0/po/zh_CN/kwalletd5.po 2021-05-01 14:40:57.000000000 +0200 +++ new/kwallet-5.83.0/po/zh_CN/kwalletd5.po 2021-06-05 11:25:07.000000000 +0200 @@ -11,7 +11,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-03-02 02:37+0100\n" -"PO-Revision-Date: 2021-04-24 15:43\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/kwallet-5.82.0/src/api/KWallet/CMakeLists.txt new/kwallet-5.83.0/src/api/KWallet/CMakeLists.txt --- old/kwallet-5.82.0/src/api/KWallet/CMakeLists.txt 2021-05-01 14:40:57.000000000 +0200 +++ new/kwallet-5.83.0/src/api/KWallet/CMakeLists.txt 2021-06-05 11:25:07.000000000 +0200 @@ -24,11 +24,16 @@ set(MAC_USE_OSXKEYCHAIN FALSE) endif() +add_library(KF5Wallet) +add_library(KF5::Wallet ALIAS KF5Wallet) + if (MAC_USE_OSXKEYCHAIN) FIND_LIBRARY(SECURITY_LIBRARY Security) - set(kwallet_SRCS kwallet_mac.cpp) + target_sources(KF5Wallet PRIVATE + kwallet_mac.cpp + ) else() - set(kwallet_SRCS kwallet.cpp) + set(kwallet_dbus_SRCS) if (NOT EXCLUDE_DEPRECATED_BEFORE_AND_AT STREQUAL "CURRENT" AND EXCLUDE_DEPRECATED_BEFORE_AND_AT VERSION_LESS 5.72.0) set(kwallet_xml org.kde.KWallet.xml) @@ -36,10 +41,14 @@ # copy of org.kde.KWallet.xml, but with all deprecated API removed set(kwallet_xml org.kde.KWallet.nodeprecated.xml) endif() - qt5_add_dbus_interface( kwallet_SRCS ${kwallet_xml} kwallet_interface ) + qt_add_dbus_interface(kwallet_dbus_SRCS ${kwallet_xml} kwallet_interface) + target_sources(KF5Wallet PRIVATE + kwallet.cpp + ${kwallet_dbus_SRCS} + ) endif() -ecm_qt_declare_logging_category(kwallet_SRCS +ecm_qt_declare_logging_category(KF5Wallet HEADER kwallet_api_debug.h IDENTIFIER KWALLET_API_LOG CATEGORY_NAME kf.wallet.api @@ -48,7 +57,6 @@ EXPORT KWALLET ) -add_library(KF5Wallet ${kwallet_SRCS}) ecm_generate_export_header(KF5Wallet BASE_NAME KWallet GROUP_BASE_NAME KF @@ -58,8 +66,6 @@ EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT} ) -add_library(KF5::Wallet ALIAS KF5Wallet) - target_include_directories(KF5Wallet INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KWallet>") target_link_libraries(KF5Wallet PUBLIC Qt5::Gui @@ -79,7 +85,7 @@ install(FILES ${kwallet_xml} DESTINATION ${KDE_INSTALL_DBUSINTERFACEDIR} RENAME kf5_org.kde.KWallet.xml) endif() -set_target_properties(KF5Wallet PROPERTIES VERSION ${KWALLET_VERSION_STRING} +set_target_properties(KF5Wallet PROPERTIES VERSION ${KWALLET_VERSION} SOVERSION ${KWALLET_SOVERSION} EXPORT_NAME Wallet ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.82.0/src/api/KWallet/kwallet.cpp new/kwallet-5.83.0/src/api/KWallet/kwallet.cpp --- old/kwallet-5.82.0/src/api/KWallet/kwallet.cpp 2021-05-01 14:40:57.000000000 +0200 +++ new/kwallet-5.83.0/src/api/KWallet/kwallet.cpp 2021-06-05 11:25:07.000000000 +0200 @@ -267,13 +267,14 @@ QDBusConnection::sessionBus(), QDBusServiceWatcher::WatchForUnregistration, this); - connect(watcher, SIGNAL(serviceUnregistered(QString)), this, SLOT(walletServiceUnregistered())); - // clang-format off - connect(&walletLauncher()->getInterface(), &OrgKdeKWalletInterface::walletClosedId, this, &KWallet::Wallet::slotWalletClosed); - connect(&walletLauncher()->getInterface(), SIGNAL(folderListUpdated(QString)), SLOT(slotFolderListUpdated(QString))); - connect(&walletLauncher()->getInterface(), SIGNAL(folderUpdated(QString,QString)), SLOT(slotFolderUpdated(QString,QString))); - connect(&walletLauncher()->getInterface(), SIGNAL(applicationDisconnected(QString,QString)), SLOT(slotApplicationDisconnected(QString,QString))); - // clang-format on + connect(watcher, &QDBusServiceWatcher::serviceUnregistered, this, [this]() { + d->walletServiceUnregistered(); + }); + + connect(&walletLauncher()->getInterface(), &org::kde::KWallet::walletClosedId, this, &KWallet::Wallet::slotWalletClosed); + connect(&walletLauncher()->getInterface(), &org::kde::KWallet::folderListUpdated, this, &KWallet::Wallet::slotFolderListUpdated); + connect(&walletLauncher()->getInterface(), &org::kde::KWallet::folderUpdated, this, &KWallet::Wallet::slotFolderUpdated); + connect(&walletLauncher()->getInterface(), &org::kde::KWallet::applicationDisconnected, this, &KWallet::Wallet::slotApplicationDisconnected); // Verify that the wallet is still open if (d->handle != -1) { @@ -491,7 +492,7 @@ // connect the daemon's opened signal to the slot filtering the // signals we need - connect(&walletLauncher()->getInterface(), SIGNAL(walletAsyncOpened(int, int)), wallet, SLOT(walletAsyncOpened(int, int))); + connect(&walletLauncher()->getInterface(), &org::kde::KWallet::walletAsyncOpened, wallet, &KWallet::Wallet::walletAsyncOpened); // Make sure the password prompt window will be visible and activated KWindowSystem::allowExternalProcessWindowActivation(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.82.0/src/runtime/kwallet-query/src/CMakeLists.txt new/kwallet-5.83.0/src/runtime/kwallet-query/src/CMakeLists.txt --- old/kwallet-5.82.0/src/runtime/kwallet-query/src/CMakeLists.txt 2021-05-01 14:40:57.000000000 +0200 +++ new/kwallet-5.83.0/src/runtime/kwallet-query/src/CMakeLists.txt 2021-06-05 11:25:07.000000000 +0200 @@ -1,9 +1,12 @@ remove_definitions(-DQT_NO_CAST_FROM_ASCII) -set(kwallet-query_SRCS + +add_executable(kwallet-query) + +target_sources(kwallet-query PRIVATE main.cpp - querydriver.cpp) + querydriver.cpp +) -add_executable(kwallet-query ${kwallet-query_SRCS}) TARGET_LINK_LIBRARIES(kwallet-query KF5Wallet diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.82.0/src/runtime/kwallet-query/src/querydriver.cpp new/kwallet-5.83.0/src/runtime/kwallet-query/src/querydriver.cpp --- old/kwallet-5.82.0/src/runtime/kwallet-query/src/querydriver.cpp 2021-05-01 14:40:57.000000000 +0200 +++ new/kwallet-5.83.0/src/runtime/kwallet-query/src/querydriver.cpp 2021-06-05 11:25:07.000000000 +0200 @@ -49,7 +49,7 @@ qDebug() << "standby opening wallet " << walletName; theWallet = Wallet::openWallet(walletName, 0, Wallet::Asynchronous); - connect(theWallet, SIGNAL(walletOpened(bool)), this, SLOT(walletOpened(bool))); + connect(theWallet, &KWallet::Wallet::walletOpened, this, &QueryDriver::walletOpened); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.82.0/src/runtime/kwalletd/CMakeLists.txt new/kwallet-5.83.0/src/runtime/kwalletd/CMakeLists.txt --- old/kwallet-5.82.0/src/runtime/kwalletd/CMakeLists.txt 2021-05-01 14:40:57.000000000 +0200 +++ new/kwallet-5.83.0/src/runtime/kwalletd/CMakeLists.txt 2021-06-05 11:25:07.000000000 +0200 @@ -28,6 +28,8 @@ ########### kwalletd ############### +add_executable(kwalletd5) + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/backend) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../api/KWallet) include_directories(${CMAKE_CURRENT_BINARY_DIR}/../../api/KWallet) @@ -39,7 +41,7 @@ PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5WalletConfigVersion.cmake" SOVERSION 5) -set(kwalletd_SRCS +target_sources(kwalletd5 PRIVATE main.cpp kbetterthankdialog.cpp kwalletd.cpp @@ -47,7 +49,7 @@ ktimeout.cpp kwalletsessionstore.cpp ) -ecm_qt_declare_logging_category(kwalletd_SRCS +ecm_qt_declare_logging_category(kwalletd5 HEADER kwalletd_debug.h IDENTIFIER KWALLETD_LOG CATEGORY_NAME kf.wallet.kwalletd @@ -56,7 +58,7 @@ EXPORT KWALLET ) -ki18n_wrap_ui(kwalletd_SRCS +ki18n_wrap_ui(kwalletd5 kbetterthankdialogbase.ui kwalletwizardpageexplanation.ui kwalletwizardpageintro.ui @@ -65,11 +67,10 @@ ) if (Gpgmepp_FOUND) - set(kwalletd_SRCS - ${kwalletd_SRCS} + target_sources(kwalletd5 PRIVATE knewwalletdialog.cpp ) - ki18n_wrap_ui(kwalletd_SRCS + ki18n_wrap_ui(kwalletd5 kwalletwizardpagepasswordgpg.ui kwalletwizardpagegpgkey.ui knewwalletdialogintro.ui @@ -85,7 +86,11 @@ set(kwallet_xml ${CMAKE_SOURCE_DIR}/src/api/KWallet/org.kde.KWallet.nodeprecated.xml) endif() -qt5_add_dbus_adaptor( kwalletd_SRCS ${kwallet_xml} kwalletd.h KWalletD kwalletadaptor KWalletAdaptor) +set(kwalletd_dbus_SRCS) +qt_add_dbus_adaptor(kwalletd_dbus_SRCS ${kwallet_xml} kwalletd.h KWalletD kwalletadaptor KWalletAdaptor) +target_sources(kwalletd5 PRIVATE + ${kwalletd_dbus_SRCS} +) if(WIN32) configure_file(org.kde.kwalletd5.service.win.in @@ -98,8 +103,6 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kwalletd5.service DESTINATION ${KDE_INSTALL_DBUSSERVICEDIR}) -add_executable( kwalletd5 ${kwalletd_SRCS} ) - target_link_libraries(kwalletd5 kwalletbackend5 KF5Wallet diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.82.0/src/runtime/kwalletd/backend/CMakeLists.txt new/kwallet-5.83.0/src/runtime/kwalletd/backend/CMakeLists.txt --- old/kwallet-5.82.0/src/runtime/kwalletd/backend/CMakeLists.txt 2021-05-01 14:40:57.000000000 +0200 +++ new/kwallet-5.83.0/src/runtime/kwalletd/backend/CMakeLists.txt 2021-06-05 11:25:07.000000000 +0200 @@ -25,13 +25,15 @@ PURPOSE "kwalletd needs libgcrypt to perform PBKDF2-SHA512 hashing" ) +add_library(kwalletbackend5 SHARED) + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../api/KWallet) include_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../api/KWallet) include_directories(${LIBGCRYPT_INCLUDE_DIRS}) remove_definitions(-DQT_NO_CAST_FROM_ASCII) -set(kwalletbackend_LIB_SRCS +target_sources(kwalletbackend5 PRIVATE blockcipher.cc blowfish.cc cbc.cc @@ -40,7 +42,7 @@ kwalletbackend.cc backendpersisthandler.cpp ) -ecm_qt_declare_logging_category(kwalletbackend_LIB_SRCS +ecm_qt_declare_logging_category(kwalletbackend5 HEADER kwalletbackend_debug.h IDENTIFIER KWALLETBACKEND_LOG CATEGORY_NAME kf.wallet.backend @@ -50,7 +52,6 @@ ) -add_library(kwalletbackend5 SHARED ${kwalletbackend_LIB_SRCS}) generate_export_header(kwalletbackend5) ecm_setup_version(${KF_VERSION} VARIABLE_PREFIX KWALLETBACKEND SOVERSION 5) @@ -65,7 +66,10 @@ target_link_libraries(kwalletbackend5 advapi32) endif(WIN32 AND NOT WINCE) -set_target_properties(kwalletbackend5 PROPERTIES VERSION ${KWALLETBACKEND_VERSION_STRING} SOVERSION ${KWALLETBACKEND_SOVERSION} ) +set_target_properties(kwalletbackend5 PROPERTIES + VERSION ${KWALLETBACKEND_VERSION} + SOVERSION ${KWALLETBACKEND_SOVERSION} +) install(TARGETS kwalletbackend5 ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) add_subdirectory(tests) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.82.0/src/runtime/kwalletd/kbetterthankdialog.cpp new/kwallet-5.83.0/src/runtime/kwalletd/kbetterthankdialog.cpp --- old/kwallet-5.82.0/src/runtime/kwalletd/kbetterthankdialog.cpp 2021-05-01 14:40:57.000000000 +0200 +++ new/kwallet-5.83.0/src/runtime/kwalletd/kbetterthankdialog.cpp 2021-06-05 11:25:07.000000000 +0200 @@ -12,10 +12,10 @@ : QDialog(parent) { setupUi(this); - connect(_allowOnce, SIGNAL(clicked()), this, SLOT(allowOnceClicked())); - connect(_allowAlways, SIGNAL(clicked()), this, SLOT(allowAlwaysClicked())); - connect(_deny, SIGNAL(clicked()), this, SLOT(denyClicked())); - connect(_denyForever, SIGNAL(clicked()), this, SLOT(denyForeverClicked())); + connect(_allowOnce, &QPushButton::clicked, this, &KBetterThanKDialog::allowOnceClicked); + connect(_allowAlways, &QPushButton::clicked, this, &KBetterThanKDialog::allowAlwaysClicked); + connect(_deny, &QPushButton::clicked, this, &KBetterThanKDialog::denyClicked); + connect(_denyForever, &QPushButton::clicked, this, &KBetterThanKDialog::denyForeverClicked); init(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.82.0/src/runtime/kwalletd/kwalletd.cpp new/kwallet-5.83.0/src/runtime/kwalletd/kwalletd.cpp --- old/kwallet-5.82.0/src/runtime/kwalletd/kwalletd.cpp 2021-05-01 14:40:57.000000000 +0200 +++ new/kwallet-5.83.0/src/runtime/kwalletd/kwalletd.cpp 2021-06-05 11:25:07.000000000 +0200 @@ -105,8 +105,8 @@ _showingFailureNotify = false; _closeIdle = false; _idleTime = 0; - connect(&_closeTimers, SIGNAL(timedOut(int)), this, SLOT(timedOutClose(int))); - connect(&_syncTimers, SIGNAL(timedOut(int)), this, SLOT(timedOutSync(int))); + connect(&_closeTimers, &KTimeout::timedOut, this, &KWalletD::timedOutClose); + connect(&_syncTimers, &KTimeout::timedOut, this, &KWalletD::timedOutSync); (void)new KWalletAdaptor(this); // register services @@ -125,11 +125,11 @@ _dw->addDir(KWallet::Backend::getSaveLocation()); _dw->startScan(true); - connect(_dw, SIGNAL(dirty(QString)), this, SLOT(emitWalletListDirty())); + connect(_dw, &KDirWatch::dirty, this, &KWalletD::emitWalletListDirty); connect(_dw, &KDirWatch::deleted, this, &KWalletD::emitWalletListDirty); _serviceWatcher.setWatchMode(QDBusServiceWatcher::WatchForOwnerChange); - connect(&_serviceWatcher, SIGNAL(serviceOwnerChanged(QString, QString, QString)), this, SLOT(slotServiceOwnerChanged(QString, QString, QString))); + connect(&_serviceWatcher, &QDBusServiceWatcher::serviceOwnerChanged, this, &KWalletD::slotServiceOwnerChanged); } void KWalletD::registerKWalletd4Service() @@ -604,7 +604,7 @@ i18nc("Text of a button for switching to the application requesting a password", "Switch to %1", appid.toHtmlEscaped())); } notification->setActions(actions); - connect(notification, SIGNAL(action1Activated()), this, SLOT(activatePasswordDialog())); + connect(notification, &KNotification::action1Activated, this, &KWalletD::activatePasswordDialog); notification->sendEvent(); } while (!b->isOpen()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.82.0/src/runtime/kwalletd/kwalletwizard.cpp new/kwallet-5.83.0/src/runtime/kwalletd/kwalletwizard.cpp --- old/kwallet-5.82.0/src/runtime/kwalletd/kwalletwizard.cpp 2021-05-01 14:40:57.000000000 +0200 +++ new/kwallet-5.83.0/src/runtime/kwalletd/kwalletwizard.cpp 2021-06-05 11:25:07.000000000 +0200 @@ -59,7 +59,7 @@ class PagePassword : public QWizardPage { public: - explicit PagePassword(QWidget *parent) + explicit PagePassword(KWalletWizard *parent) : QWizardPage(parent) { ui.setupUi(this); @@ -70,12 +70,12 @@ #ifdef HAVE_GPGMEPP registerField(QStringLiteral("useGPG"), ui._radioGpg); registerField(QStringLiteral("useBlowfish"), ui._radioBlowfish); - connect(ui._radioBlowfish, SIGNAL(toggled(bool)), parent, SLOT(passwordPageUpdate())); + connect(ui._radioBlowfish, &QRadioButton::toggled, parent, &KWalletWizard::passwordPageUpdate); #endif - connect(ui._useWallet, SIGNAL(clicked()), parent, SLOT(passwordPageUpdate())); - connect(ui._pass1, SIGNAL(textChanged(QString)), parent, SLOT(passwordPageUpdate())); - connect(ui._pass2, SIGNAL(textChanged(QString)), parent, SLOT(passwordPageUpdate())); + connect(ui._useWallet, &QCheckBox::clicked, parent, &KWalletWizard::passwordPageUpdate); + connect(ui._pass1, &QLineEdit::textChanged, parent, &KWalletWizard::passwordPageUpdate); + connect(ui._pass2, &QLineEdit::textChanged, parent, &KWalletWizard::passwordPageUpdate); ui._useWallet->setChecked(true); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.82.0/src/runtime/kwalletd/kwalletwizard.h new/kwallet-5.83.0/src/runtime/kwalletd/kwalletwizard.h --- old/kwallet-5.82.0/src/runtime/kwalletd/kwalletwizard.h 2021-05-01 14:40:57.000000000 +0200 +++ new/kwallet-5.83.0/src/runtime/kwalletd/kwalletwizard.h 2021-06-05 11:25:07.000000000 +0200 @@ -43,6 +43,7 @@ void initializePage(int id) override; protected Q_SLOTS: + friend class PagePassword; void passwordPageUpdate(); private: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.82.0/tests/kwalletd/CMakeLists.txt new/kwallet-5.83.0/tests/kwalletd/CMakeLists.txt --- old/kwallet-5.82.0/tests/kwalletd/CMakeLists.txt 2021-05-01 14:40:57.000000000 +0200 +++ new/kwallet-5.83.0/tests/kwalletd/CMakeLists.txt 2021-06-05 11:25:07.000000000 +0200 @@ -16,11 +16,9 @@ remove_definitions(-DQT_NO_CAST_FROM_ASCII) remove_definitions(-DQT_NO_CAST_FROM_BYTEARRAY) -set(kwalletwizardtest_SRCS - kwalletwizardtest.cpp - ../../src/runtime/kwalletd/kwalletwizard.cpp -) -qt5_wrap_ui(kwalletwizardtest_SRCS +add_executable(kwalletwizardtest) +set(kwalletwizardtest_ui_SRCS) +qt_wrap_ui(kwalletwizardtest_ui_SRCS ../../src/runtime/kwalletd/kbetterthankdialogbase.ui ../../src/runtime/kwalletd/kwalletwizardpageexplanation.ui ../../src/runtime/kwalletd/kwalletwizardpageintro.ui @@ -30,11 +28,15 @@ ) if (Gpgmepp_FOUND) - qt5_wrap_ui(kwalletwizardtest_SRCS + qt_wrap_ui(kwalletwizardtest_ui_SRCS ../../src/runtime/kwalletd/kwalletwizardpagepasswordgpg.ui) endif(Gpgmepp_FOUND) -add_executable(kwalletwizardtest ${kwalletwizardtest_SRCS}) +target_sources(kwalletwizardtest PRIVATE + kwalletwizardtest.cpp + ../../src/runtime/kwalletd/kwalletwizard.cpp + ${kwalletwizardtest_ui_SRCS} +) ecm_mark_as_test(kwalletwizardtest) target_link_libraries(kwalletwizardtest KF5Wallet @@ -46,8 +48,7 @@ target_link_libraries(kwalletwizardtest Gpgmepp) endif(Gpgmepp_FOUND) -set(kwallettestlib_SRCS kwallettest.cpp) -add_library(kwallettestlib STATIC ${kwallettestlib_SRCS}) +add_library(kwallettestlib STATIC kwallettest.cpp) target_link_libraries(kwallettestlib KF5Wallet Qt5::Widgets) macro(kwalletd_tests) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.82.0/tests/kwalletd/kwalletasync.cpp new/kwallet-5.83.0/tests/kwalletd/kwalletasync.cpp --- old/kwallet-5.82.0/tests/kwalletd/kwalletasync.cpp 2021-05-01 14:40:57.000000000 +0200 +++ new/kwallet-5.83.0/tests/kwalletd/kwalletasync.cpp 2021-06-05 11:25:07.000000000 +0200 @@ -30,7 +30,7 @@ QVERIFY(wallet != nullptr); WalletReceiver r; - QVERIFY(r.connect(wallet, SIGNAL(walletOpened(bool)), SLOT(walletOpened(bool)))); + QVERIFY(connect(wallet, &KWallet::Wallet::walletOpened, &r, &WalletReceiver::walletOpened)); _out << "About to start 30 second event loop\n"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.82.0/tests/kwalletd/kwalletboth.cpp new/kwallet-5.83.0/tests/kwalletd/kwalletboth.cpp --- old/kwallet-5.82.0/tests/kwalletd/kwalletboth.cpp 2021-05-01 14:40:57.000000000 +0200 +++ new/kwallet-5.83.0/tests/kwalletd/kwalletboth.cpp 2021-06-05 11:25:07.000000000 +0200 @@ -31,7 +31,7 @@ QVERIFY(wallet != nullptr); WalletReceiver r; - r.connect(wallet, SIGNAL(walletOpened(bool)), SLOT(walletOpened(bool))); + connect(wallet, &KWallet::Wallet::walletOpened, &r, &WalletReceiver::walletOpened); _out << "About to ask for wallet sync\n"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.82.0/tests/kwalletd/kwalletmany.cpp new/kwallet-5.83.0/tests/kwalletd/kwalletmany.cpp --- old/kwallet-5.82.0/tests/kwalletd/kwalletmany.cpp 2021-05-01 14:40:57.000000000 +0200 +++ new/kwallet-5.83.0/tests/kwalletd/kwalletmany.cpp 2021-06-05 11:25:07.000000000 +0200 @@ -52,7 +52,7 @@ Wallet *wallet; wallet = Wallet::openWallet(Wallet::NetworkWallet(), 0, Wallet::Asynchronous); QVERIFY(wallet != nullptr); - connect(wallet, SIGNAL(walletOpened(bool)), SLOT(walletOpened(bool))); + connect(wallet, &KWallet::Wallet::walletOpened, this, &KWalletMany::walletOpened); _wallets.append(wallet); } _out.flush();
