From 2858f3be71ccbf819a4bf97b54a930bf124bde77 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Fri, 2 Jun 2023 02:45:51 +0300 Subject: [PATCH] plasma: const-ify the service job parameters Signed-off-by: Ivailo Monev --- plasma/private/dataengineservice.cpp | 2 +- plasma/private/dataengineservice_p.h | 2 +- plasma/private/getsource.cpp | 6 +++--- plasma/private/getsource_p.h | 2 +- plasma/private/plasmoidservice.cpp | 4 ++-- plasma/private/plasmoidservice_p.h | 4 ++-- plasma/private/service_p.h | 2 +- plasma/service.cpp | 3 +-- plasma/service.h | 2 +- 9 files changed, 13 insertions(+), 14 deletions(-) diff --git a/plasma/private/dataengineservice.cpp b/plasma/private/dataengineservice.cpp index d6b22e5f..113e0306 100644 --- a/plasma/private/dataengineservice.cpp +++ b/plasma/private/dataengineservice.cpp @@ -36,7 +36,7 @@ DataEngineService::DataEngineService(DataEngine *engine) } Plasma::ServiceJob* DataEngineService::createJob(const QString& operation, - QMap& parameters) + const QMap& parameters) { return new GetSource(m_engine, operation, parameters, this); } diff --git a/plasma/private/dataengineservice_p.h b/plasma/private/dataengineservice_p.h index ab6a2058..b4ce4ea4 100644 --- a/plasma/private/dataengineservice_p.h +++ b/plasma/private/dataengineservice_p.h @@ -42,7 +42,7 @@ class DataEngineService : public Plasma::Service protected: Plasma::ServiceJob* createJob(const QString& operation, - QMap& parameters); + const QMap& parameters); private Q_SLOTS: void sourceAdded(QString source); diff --git a/plasma/private/getsource.cpp b/plasma/private/getsource.cpp index 6e634453..56362a35 100644 --- a/plasma/private/getsource.cpp +++ b/plasma/private/getsource.cpp @@ -30,9 +30,9 @@ namespace Plasma { GetSource::GetSource(DataEngine *engine, const QString& operation, - QMap& parameters, - DataEngineService *service) - : ServiceJob(QString("publickey"), operation, parameters, service), + const QMap& parameters, + DataEngineService *service) + : ServiceJob(QString::fromLatin1("publickey"), operation, parameters, service), m_engine(engine), m_service(service) { diff --git a/plasma/private/getsource_p.h b/plasma/private/getsource_p.h index 0c71b370..fe41fbbc 100644 --- a/plasma/private/getsource_p.h +++ b/plasma/private/getsource_p.h @@ -33,7 +33,7 @@ class GetSource : public Plasma::ServiceJob public: GetSource(DataEngine *engine, const QString& operation, - QMap& parameters, + const QMap& parameters, DataEngineService *service = 0); void start(); diff --git a/plasma/private/plasmoidservice.cpp b/plasma/private/plasmoidservice.cpp index 79873276..3ef31e6f 100644 --- a/plasma/private/plasmoidservice.cpp +++ b/plasma/private/plasmoidservice.cpp @@ -37,7 +37,7 @@ namespace Plasma PlasmoidServiceJob::PlasmoidServiceJob(const QString &destination, const QString &operation, - QMap& parameters, + const QMap& parameters, PlasmoidService *service) : Plasma::ServiceJob(destination, operation, parameters, static_cast(service)), @@ -89,7 +89,7 @@ PackageMetadata PlasmoidService::metadata() const } Plasma::ServiceJob* PlasmoidService::createJob(const QString& operation, - QMap& parameters) + const QMap& parameters) { return new PlasmoidServiceJob(destination(), operation, parameters, this); } diff --git a/plasma/private/plasmoidservice_p.h b/plasma/private/plasmoidservice_p.h index 9baf4568..6c0ca2cd 100644 --- a/plasma/private/plasmoidservice_p.h +++ b/plasma/private/plasmoidservice_p.h @@ -39,7 +39,7 @@ class PlasmoidServiceJob : public ServiceJob public: PlasmoidServiceJob(const QString &destination, const QString &operation, - QMap& parameters, + const QMap& parameters, PlasmoidService *parent = 0); void start(); @@ -60,7 +60,7 @@ class PlasmoidService : public Service, DataEngineConsumer protected: Plasma::ServiceJob* createJob(const QString& operation, - QMap& parameters); + const QMap& parameters); private: QString m_packagePath; diff --git a/plasma/private/service_p.h b/plasma/private/service_p.h index 6315ef5f..792271fa 100644 --- a/plasma/private/service_p.h +++ b/plasma/private/service_p.h @@ -61,7 +61,7 @@ public: setName("NullService"); } - ServiceJob *createJob(const QString &operation, QMap &) + ServiceJob *createJob(const QString &operation, const QMap &) { return new NullServiceJob(destination(), operation, this); } diff --git a/plasma/service.cpp b/plasma/service.cpp index b8ee05ad..9b838746 100644 --- a/plasma/service.cpp +++ b/plasma/service.cpp @@ -159,8 +159,7 @@ ServiceJob *Service::startOperationCall(const KConfigGroup &description, QObject if (d->disabledOperations.contains(op)) { kDebug() << "Operation" << op << "is disabled"; } else { - QMap params = parametersFromDescription(description); - job = createJob(op, params); + job = createJob(op, parametersFromDescription(description)); } } else { kDebug() << op << "is not a valid group; valid groups are:" << d->config->groupList(); diff --git a/plasma/service.h b/plasma/service.h index 829d1ce4..e94e8e05 100644 --- a/plasma/service.h +++ b/plasma/service.h @@ -276,7 +276,7 @@ protected: * @return a ServiceJob that can be started and monitored by the consumer */ virtual ServiceJob *createJob(const QString &operation, - QMap ¶meters) = 0; + const QMap ¶meters) = 0; /** * By default this is based on the file in plasma/services/name.operations, but can be