Merge branch 'master' of git://anongit.kde.org/plasma-framework

This commit is contained in:
andreas kainz 2016-06-27 15:13:09 +02:00
commit 05b346bd69

View File

@ -68,8 +68,8 @@ class ServicePrivate;
* @code * @code
* Plasma::DataEngine *twitter = dataEngine("twitter"); * Plasma::DataEngine *twitter = dataEngine("twitter");
* Plasma::Service *service = twitter.serviceForSource("aseigo"); * Plasma::Service *service = twitter.serviceForSource("aseigo");
* KConfigGroup op = service->operationDescription("update"); * QVariantMap op = service->operationDescription("update");
* op.writeEntry("tweet", "Hacking on plasma!"); * op.insert("tweet", "Hacking on plasma!");
* Plasma::ServiceJob *job = service->startOperationCall(op); * Plasma::ServiceJob *job = service->startOperationCall(op);
* connect(job, SIGNAL(finished(KJob*)), this, SLOT(jobCompeted())); * connect(job, SIGNAL(finished(KJob*)), this, SLOT(jobCompeted()));
* @endcode * @endcode
@ -124,7 +124,7 @@ public:
* Retrieves the parameters for a given operation * Retrieves the parameters for a given operation
* *
* @param operationName the operation to retrieve parameters for * @param operationName the operation to retrieve parameters for
* @return KConfigGroup containing the parameters * @return QVariantMap containing the parameters
*/ */
Q_INVOKABLE QVariantMap operationDescription(const QString &operationName); Q_INVOKABLE QVariantMap operationDescription(const QString &operationName);