From b91e927ffa4615d331d0be7eb15694ac7bcfd296 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Mon, 22 May 2023 02:58:28 +0300 Subject: [PATCH] plasma: remove non-operational service monitor was used for remote widgets and their services Signed-off-by: Ivailo Monev --- plasma/containment.cpp | 1 + plasma/extenders/extender.cpp | 2 ++ plasma/private/dataengineconsumer.cpp | 40 ++------------------------- plasma/private/dataengineconsumer_p.h | 28 +------------------ 4 files changed, 6 insertions(+), 65 deletions(-) diff --git a/plasma/containment.cpp b/plasma/containment.cpp index 754c5dce..8de7209c 100644 --- a/plasma/containment.cpp +++ b/plasma/containment.cpp @@ -44,6 +44,7 @@ #include #include #include +#include #ifndef PLASMA_NO_KIO #include "kio/jobclasses.h" // for KIO::JobFlags diff --git a/plasma/extenders/extender.cpp b/plasma/extenders/extender.cpp index d53b9449..6b4a7e14 100644 --- a/plasma/extenders/extender.cpp +++ b/plasma/extenders/extender.cpp @@ -27,6 +27,8 @@ #include #include +#include + #include "applet.h" #include "containment.h" #include "corona.h" diff --git a/plasma/private/dataengineconsumer.cpp b/plasma/private/dataengineconsumer.cpp index 783e7a3e..40ccba60 100644 --- a/plasma/private/dataengineconsumer.cpp +++ b/plasma/private/dataengineconsumer.cpp @@ -25,47 +25,13 @@ #include -#include +#include "plasma/dataenginemanager.h" +#include "servicejob.h" namespace Plasma { -ServiceMonitor::ServiceMonitor(DataEngineConsumer *consumer) - : m_consumer(consumer) -{ -} - -ServiceMonitor::~ServiceMonitor() -{ -} - -void ServiceMonitor::slotJobFinished(Plasma::ServiceJob *job) -{ - const QString engineName = job->parameters()["EngineName"].toString(); - const QString location = job->destination(); - kDebug() << "engine ready!" << engineName << location; -} - -void ServiceMonitor::slotServiceReady(Plasma::Service *plasmoidService) -{ - kDebug() << "service ready!"; - if (!m_consumer->m_engineNameForService.contains(plasmoidService)) { - kDebug() << "no engine name for service!"; - kDebug() << "amount of services in map: " << m_consumer->m_engineNameForService.count(); - } else { - kDebug() << "value = " << m_consumer->m_engineNameForService.value(plasmoidService); - } - - kDebug() << "requesting dataengine!"; - KConfigGroup op = plasmoidService->operationDescription("DataEngine"); - op.writeEntry("EngineName", m_consumer->m_engineNameForService.value(plasmoidService)); - plasmoidService->startOperationCall(op); - connect(plasmoidService, SIGNAL(finished(Plasma::ServiceJob*)), - this, SLOT(slotJobFinished(Plasma::ServiceJob*))); -} - DataEngineConsumer::DataEngineConsumer() - : m_monitor(new ServiceMonitor(this)) { } @@ -74,8 +40,6 @@ DataEngineConsumer::~DataEngineConsumer() foreach (const QString &engine, m_loadedEngines) { DataEngineManager::self()->unloadEngine(engine); } - - delete m_monitor; } DataEngine *DataEngineConsumer::dataEngine(const QString &name) diff --git a/plasma/private/dataengineconsumer_p.h b/plasma/private/dataengineconsumer_p.h index 35e98041..efea5702 100644 --- a/plasma/private/dataengineconsumer_p.h +++ b/plasma/private/dataengineconsumer_p.h @@ -24,31 +24,11 @@ #include -#include - -#include "plasma/dataenginemanager.h" -#include +#include "plasma/dataengine.h" namespace Plasma { -class DataEngineConsumer; - -class ServiceMonitor : public QObject -{ - Q_OBJECT -public: - ServiceMonitor(DataEngineConsumer *consumer); - ~ServiceMonitor(); - -public Q_SLOTS: - void slotJobFinished(Plasma::ServiceJob *job); - void slotServiceReady(Plasma::Service *service); - -private: - DataEngineConsumer *m_consumer; -}; - class DataEngineConsumer { public: @@ -58,14 +38,8 @@ public: private: QSet m_loadedEngines; - QMap m_engineNameForService; - ServiceMonitor *m_monitor; - - friend class ServiceMonitor; }; } // namespace Plasma #endif - -