mirror of
https://bitbucket.org/smil3y/kdelibs.git
synced 2025-02-24 02:42:48 +00:00
plasma: const-ify the service job parameters
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
parent
7c8aed76ae
commit
2858f3be71
9 changed files with 13 additions and 14 deletions
|
@ -36,7 +36,7 @@ DataEngineService::DataEngineService(DataEngine *engine)
|
||||||
}
|
}
|
||||||
|
|
||||||
Plasma::ServiceJob* DataEngineService::createJob(const QString& operation,
|
Plasma::ServiceJob* DataEngineService::createJob(const QString& operation,
|
||||||
QMap<QString,QVariant>& parameters)
|
const QMap<QString,QVariant>& parameters)
|
||||||
{
|
{
|
||||||
return new GetSource(m_engine, operation, parameters, this);
|
return new GetSource(m_engine, operation, parameters, this);
|
||||||
}
|
}
|
||||||
|
|
|
@ -42,7 +42,7 @@ class DataEngineService : public Plasma::Service
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
Plasma::ServiceJob* createJob(const QString& operation,
|
Plasma::ServiceJob* createJob(const QString& operation,
|
||||||
QMap<QString,QVariant>& parameters);
|
const QMap<QString,QVariant>& parameters);
|
||||||
|
|
||||||
private Q_SLOTS:
|
private Q_SLOTS:
|
||||||
void sourceAdded(QString source);
|
void sourceAdded(QString source);
|
||||||
|
|
|
@ -30,9 +30,9 @@ namespace Plasma
|
||||||
{
|
{
|
||||||
|
|
||||||
GetSource::GetSource(DataEngine *engine, const QString& operation,
|
GetSource::GetSource(DataEngine *engine, const QString& operation,
|
||||||
QMap<QString,QVariant>& parameters,
|
const QMap<QString,QVariant>& parameters,
|
||||||
DataEngineService *service)
|
DataEngineService *service)
|
||||||
: ServiceJob(QString("publickey"), operation, parameters, service),
|
: ServiceJob(QString::fromLatin1("publickey"), operation, parameters, service),
|
||||||
m_engine(engine),
|
m_engine(engine),
|
||||||
m_service(service)
|
m_service(service)
|
||||||
{
|
{
|
||||||
|
|
|
@ -33,7 +33,7 @@ class GetSource : public Plasma::ServiceJob
|
||||||
|
|
||||||
public:
|
public:
|
||||||
GetSource(DataEngine *engine, const QString& operation,
|
GetSource(DataEngine *engine, const QString& operation,
|
||||||
QMap<QString,QVariant>& parameters,
|
const QMap<QString,QVariant>& parameters,
|
||||||
DataEngineService *service = 0);
|
DataEngineService *service = 0);
|
||||||
|
|
||||||
void start();
|
void start();
|
||||||
|
|
|
@ -37,7 +37,7 @@ namespace Plasma
|
||||||
|
|
||||||
PlasmoidServiceJob::PlasmoidServiceJob(const QString &destination,
|
PlasmoidServiceJob::PlasmoidServiceJob(const QString &destination,
|
||||||
const QString &operation,
|
const QString &operation,
|
||||||
QMap<QString,QVariant>& parameters,
|
const QMap<QString,QVariant>& parameters,
|
||||||
PlasmoidService *service)
|
PlasmoidService *service)
|
||||||
: Plasma::ServiceJob(destination, operation, parameters,
|
: Plasma::ServiceJob(destination, operation, parameters,
|
||||||
static_cast<Plasma::Service*>(service)),
|
static_cast<Plasma::Service*>(service)),
|
||||||
|
@ -89,7 +89,7 @@ PackageMetadata PlasmoidService::metadata() const
|
||||||
}
|
}
|
||||||
|
|
||||||
Plasma::ServiceJob* PlasmoidService::createJob(const QString& operation,
|
Plasma::ServiceJob* PlasmoidService::createJob(const QString& operation,
|
||||||
QMap<QString,QVariant>& parameters)
|
const QMap<QString,QVariant>& parameters)
|
||||||
{
|
{
|
||||||
return new PlasmoidServiceJob(destination(), operation, parameters, this);
|
return new PlasmoidServiceJob(destination(), operation, parameters, this);
|
||||||
}
|
}
|
||||||
|
|
|
@ -39,7 +39,7 @@ class PlasmoidServiceJob : public ServiceJob
|
||||||
public:
|
public:
|
||||||
PlasmoidServiceJob(const QString &destination,
|
PlasmoidServiceJob(const QString &destination,
|
||||||
const QString &operation,
|
const QString &operation,
|
||||||
QMap<QString,QVariant>& parameters,
|
const QMap<QString,QVariant>& parameters,
|
||||||
PlasmoidService *parent = 0);
|
PlasmoidService *parent = 0);
|
||||||
|
|
||||||
void start();
|
void start();
|
||||||
|
@ -60,7 +60,7 @@ class PlasmoidService : public Service, DataEngineConsumer
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
Plasma::ServiceJob* createJob(const QString& operation,
|
Plasma::ServiceJob* createJob(const QString& operation,
|
||||||
QMap<QString,QVariant>& parameters);
|
const QMap<QString,QVariant>& parameters);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
QString m_packagePath;
|
QString m_packagePath;
|
||||||
|
|
|
@ -61,7 +61,7 @@ public:
|
||||||
setName("NullService");
|
setName("NullService");
|
||||||
}
|
}
|
||||||
|
|
||||||
ServiceJob *createJob(const QString &operation, QMap<QString, QVariant> &)
|
ServiceJob *createJob(const QString &operation, const QMap<QString, QVariant> &)
|
||||||
{
|
{
|
||||||
return new NullServiceJob(destination(), operation, this);
|
return new NullServiceJob(destination(), operation, this);
|
||||||
}
|
}
|
||||||
|
|
|
@ -159,8 +159,7 @@ ServiceJob *Service::startOperationCall(const KConfigGroup &description, QObject
|
||||||
if (d->disabledOperations.contains(op)) {
|
if (d->disabledOperations.contains(op)) {
|
||||||
kDebug() << "Operation" << op << "is disabled";
|
kDebug() << "Operation" << op << "is disabled";
|
||||||
} else {
|
} else {
|
||||||
QMap<QString, QVariant> params = parametersFromDescription(description);
|
job = createJob(op, parametersFromDescription(description));
|
||||||
job = createJob(op, params);
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
kDebug() << op << "is not a valid group; valid groups are:" << d->config->groupList();
|
kDebug() << op << "is not a valid group; valid groups are:" << d->config->groupList();
|
||||||
|
|
|
@ -276,7 +276,7 @@ protected:
|
||||||
* @return a ServiceJob that can be started and monitored by the consumer
|
* @return a ServiceJob that can be started and monitored by the consumer
|
||||||
*/
|
*/
|
||||||
virtual ServiceJob *createJob(const QString &operation,
|
virtual ServiceJob *createJob(const QString &operation,
|
||||||
QMap<QString, QVariant> ¶meters) = 0;
|
const QMap<QString, QVariant> ¶meters) = 0;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* By default this is based on the file in plasma/services/name.operations, but can be
|
* By default this is based on the file in plasma/services/name.operations, but can be
|
||||||
|
|
Loading…
Add table
Reference in a new issue