diff --git a/service.cpp b/service.cpp index 26cb56f68..8e3fab849 100644 --- a/service.cpp +++ b/service.cpp @@ -90,7 +90,7 @@ QString Service::destination() const return d->destination; } -QStringList Service::operationList() const +QStringList Service::operationNames() const { if (!d->config) { return QStringList(); @@ -99,17 +99,17 @@ QStringList Service::operationList() const return d->config->config()->groupList(); } -KConfigGroup Service::operationParameters(const QString &operation) +KConfigGroup Service::operationDescription(const QString &operationName) { if (!d->config) { return KConfigGroup(); } - KConfigGroup params(d->config->config(), operation); + KConfigGroup params(d->config->config(), operationName); return params; } -ServiceJob* Service::startOperation(const KConfigGroup ¶meters) +ServiceJob* Service::startOperationCall(const KConfigGroup &description) { // TODO: nested groups? if (!d->config) { @@ -118,16 +118,17 @@ ServiceJob* Service::startOperation(const KConfigGroup ¶meters) d->config->writeConfig(); QMap params; - QString op = parameters.name(); - foreach (const QString &key, parameters.keyList()) { + QString op = description.name(); + foreach (const QString &key, description.keyList()) { KConfigSkeletonItem *item = d->config->findItem(op, key); if (item) { params.insert(key, item->property()); } } - ServiceJob *job = createJob(parameters.name(), params); + ServiceJob *job = createJob(description.name(), params); connect(job, SIGNAL(finished(KJob*)), this, SLOT(jobFinished(KJob*))); + job->start(); return job; } diff --git a/service.h b/service.h index 52df46227..a39037f84 100644 --- a/service.h +++ b/service.h @@ -98,7 +98,7 @@ public: /** * @return the possible operations for this profile */ - QStringList operationList() const; + QStringList operationNames() const; /** * Retrieves the parameters for a given operation @@ -106,7 +106,7 @@ public: * @param operation the operation to retrieve parameters for * @return KConfigGroup containing the parameters */ - KConfigGroup operationParameters(const QString &operation); + KConfigGroup operationDescription(const QString &operationName); /** * Called to create a ServiceJob which is associated with a given @@ -115,7 +115,7 @@ public: * @return a started ServiceJob; the consumer may connect to relevant * signals before returning to the event loop */ - ServiceJob* startOperation(const KConfigGroup ¶meters); + ServiceJob* startOperationCall(const KConfigGroup &description); /** * The name of this service