From 5d5c792226c7b8acf87f5ca90bbd17892c8ee01c Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Thu, 2 May 2024 02:26:50 +0300 Subject: [PATCH] generic: adjust to KIO changes Signed-off-by: Ivailo Monev --- dolphin/src/views/dolphinremoteencoding.cpp | 3 +-- kcontrol/kio/ksaveioconfig.cpp | 15 ++++----------- kioslave/camera/kio_camera.cpp | 1 - plasma/applets/folderview/asyncfiletester.cpp | 2 +- 4 files changed, 6 insertions(+), 15 deletions(-) diff --git a/dolphin/src/views/dolphinremoteencoding.cpp b/dolphin/src/views/dolphinremoteencoding.cpp index e8ba031d..5a5cbf1b 100644 --- a/dolphin/src/views/dolphinremoteencoding.cpp +++ b/dolphin/src/views/dolphinremoteencoding.cpp @@ -38,7 +38,6 @@ #include #include #include -#include #include #define DATA_KEY QLatin1String("Charset") @@ -219,7 +218,7 @@ void DolphinRemoteEncoding::slotDefault() void DolphinRemoteEncoding::updateView() { - KIO::Scheduler::emitReparseSlaveConfiguration(); + KProtocolManager::reparseConfiguration(); // Reload the page with the new charset m_actionHandler->currentView()->setUrl(m_currentURL); m_actionHandler->currentView()->reload(); diff --git a/kcontrol/kio/ksaveioconfig.cpp b/kcontrol/kio/ksaveioconfig.cpp index eb05c03e..fe11b7a3 100644 --- a/kcontrol/kio/ksaveioconfig.cpp +++ b/kcontrol/kio/ksaveioconfig.cpp @@ -104,15 +104,8 @@ void KSaveIOConfig::setAutoResume( bool _mode ) void KSaveIOConfig::updateRunningIOSlaves (QWidget *parent) { - // Inform all running io-slaves about the changes... - // if we cannot update, ioslaves inform the end user... - QDBusMessage message = QDBusMessage::createSignal("/KIO/Scheduler", "org.kde.KIO.Scheduler", "reparseSlaveConfiguration"); - message << QString(); - if (!QDBusConnection::sessionBus().send(message)) - { - KMessageBox::information (parent, - i18n("You have to restart the running applications " - "for these changes to take effect."), - i18nc("@title:window", "Update Failed")); - } + KMessageBox::information( + parent, + i18n("You have to restart the running applications for these changes to take effect.") + ); } diff --git a/kioslave/camera/kio_camera.cpp b/kioslave/camera/kio_camera.cpp index e9316272..93539c80 100644 --- a/kioslave/camera/kio_camera.cpp +++ b/kioslave/camera/kio_camera.cpp @@ -45,7 +45,6 @@ #include #include #include -#include #include #include "kio_camera.h" diff --git a/plasma/applets/folderview/asyncfiletester.cpp b/plasma/applets/folderview/asyncfiletester.cpp index eb01480a..304ce2a2 100644 --- a/plasma/applets/folderview/asyncfiletester.cpp +++ b/plasma/applets/folderview/asyncfiletester.cpp @@ -24,8 +24,8 @@ #include #include #include +#include #include -#include AsyncFileTester::AsyncFileTester(const QModelIndex &index, QObject *object, const char *member)