From bc3c7567a73052af47e50440f7aa426e4cc9d688 Mon Sep 17 00:00:00 2001 From: Peter Mello Date: Fri, 20 Dec 2019 00:23:49 +0000 Subject: [PATCH] Port away from deprecated KIO/KCM functions Updated plugins/share/shareplugin.cpp: - KFileUtils::suggestName() is a drop-in replacement as of 5.64, just moved to another library Updated plugins/findthisdevice/findthisdevice_config.cpp: - KCModule::markAsChanged() is likewise as of 5.64 Signed-off-by: Peter J. Mello --- plugins/findthisdevice/findthisdevice_config.cpp | 2 +- plugins/share/shareplugin.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/findthisdevice/findthisdevice_config.cpp b/plugins/findthisdevice/findthisdevice_config.cpp index 713542671..7af7f9913 100644 --- a/plugins/findthisdevice/findthisdevice_config.cpp +++ b/plugins/findthisdevice/findthisdevice_config.cpp @@ -49,7 +49,7 @@ FindThisDeviceConfig::FindThisDeviceConfig(QWidget* parent, const QVariantList& connect(m_ui->playSoundButton, &QToolButton::clicked, this, &FindThisDeviceConfig::playSound); connect(m_ui->soundFileRequester, &KUrlRequester::textChanged, - this, QOverload<>::of(&FindThisDeviceConfig::changed)); + this, &FindThisDeviceConfig::markAsChanged); } FindThisDeviceConfig::~FindThisDeviceConfig() diff --git a/plugins/share/shareplugin.cpp b/plugins/share/shareplugin.cpp index dd67a7669..de13fc856 100644 --- a/plugins/share/shareplugin.cpp +++ b/plugins/share/shareplugin.cpp @@ -35,6 +35,7 @@ #include #include #include +#include #include "core/filetransferjob.h" #include "core/daemon.h" @@ -73,7 +74,7 @@ QUrl SharePlugin::getFileDestination(const QString filename) const QUrl destination(dir); destination.setPath(dir.path() + QStringLiteral("/") + filename, QUrl::DecodedMode); if (destination.isLocalFile() && QFile::exists(destination.toLocalFile())) { - destination.setPath(dir.path() + QStringLiteral("/") + KIO::suggestName(dir, filename), QUrl::DecodedMode); + destination.setPath(dir.path() + QStringLiteral("/") + KFileUtils::suggestName(dir, filename), QUrl::DecodedMode); } return destination; }