[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    =?utf-8?q?=5Bshare-like-connect=5D_dataengine=3A_the_result_of_a?=
From:       Marco Martin <notmart () gmail ! com>
Date:       2011-05-31 21:13:29
Message-ID: 20110531211329.B434EA60A4 () git ! kde ! org
[Download RAW message or body]

Git commit a40d200cb1f68cbaae23d64cf4d8f92b5d4e6734 by Marco Martin.
Committed on 31/05/2011 at 23:13.
Pushed by mart into branch 'master'.

the result of a provider is QVariant as well

M  +1    -1    dataengine/provider.cpp     
M  +1    -1    dataengine/provider.h     
M  +1    -1    dataengine/providers/activities/activitiesProvider.cpp     
M  +1    -1    dataengine/providers/activities/activitiesProvider.h     
M  +1    -1    dataengine/slcservice/slcjob.cpp     

http://commits.kde.org/share-like-connect/a40d200cb1f68cbaae23d64cf4d8f92b5d4e6734

diff --git a/dataengine/provider.cpp b/dataengine/provider.cpp
index eb621e6..4d6a741 100644
--- a/dataengine/provider.cpp
+++ b/dataengine/provider.cpp
@@ -41,7 +41,7 @@ Provider::Actions Provider::actionsFor(const QVariantHash &content) \
const  return NoAction;
 }
 
-bool Provider::executeAction(SLC::Provider::Action action, const QVariantHash \
&content, const QVariantHash &parameters) +QVariant \
Provider::executeAction(SLC::Provider::Action action, const QVariantHash &content, \
const QVariantHash &parameters)  {
     Q_UNUSED(action)
     Q_UNUSED(content)
diff --git a/dataengine/provider.h b/dataengine/provider.h
index 4e043da..bfaddbe 100644
--- a/dataengine/provider.h
+++ b/dataengine/provider.h
@@ -46,7 +46,7 @@ public:
 
     virtual Actions actionsFor(const QVariantHash &content) const;
 
-    virtual bool executeAction(SLC::Provider::Action action, const QVariantHash \
&content, const QVariantHash &parameters); +    virtual QVariant \
executeAction(SLC::Provider::Action action, const QVariantHash &content, const \
QVariantHash &parameters);  
 private:
     class Private;
diff --git a/dataengine/providers/activities/activitiesProvider.cpp \
b/dataengine/providers/activities/activitiesProvider.cpp index 5e5b104..31655fe \
                100644
--- a/dataengine/providers/activities/activitiesProvider.cpp
+++ b/dataengine/providers/activities/activitiesProvider.cpp
@@ -39,7 +39,7 @@ SLC::Provider::Actions ActivitiesProvider::actionsFor(const \
QVariantHash &conten  return NoAction;
 }
 
-bool ActivitiesProvider::executeAction(SLC::Provider::Action action, const \
QVariantHash &content, const QVariantHash &parameters) +QVariant \
ActivitiesProvider::executeAction(SLC::Provider::Action action, const QVariantHash \
&content, const QVariantHash &parameters)  {
     if (action != Connect) {
         return false;
diff --git a/dataengine/providers/activities/activitiesProvider.h \
b/dataengine/providers/activities/activitiesProvider.h index a16ef5b..0b13d6e 100644
--- a/dataengine/providers/activities/activitiesProvider.h
+++ b/dataengine/providers/activities/activitiesProvider.h
@@ -30,7 +30,7 @@ public:
     ActivitiesProvider(QObject *parent, const QVariantList &args);
     Actions actionsFor(const QVariantHash &content) const;
 
-    bool executeAction(SLC::Provider::Action action, const QVariantHash &content, \
const QVariantHash &parameters); +    QVariant executeAction(SLC::Provider::Action \
action, const QVariantHash &content, const QVariantHash &parameters);  private:
 };
 
diff --git a/dataengine/slcservice/slcjob.cpp b/dataengine/slcservice/slcjob.cpp
index 7a13f2c..eee15b9 100644
--- a/dataengine/slcservice/slcjob.cpp
+++ b/dataengine/slcservice/slcjob.cpp
@@ -50,7 +50,7 @@ void SlcJob::start()
         providerParameters["Url"] = parameters()["Url"];
         providerParameters["Comment"] = parameters()["Comment"];
         providerParameters["Target"] = parameters()["Target"];
-        bool success = m_provider.data()->executeAction(SLC::Provider::Connect, \
QVariantHash(), providerParameters); +        QVariant success = \
m_provider.data()->executeAction(SLC::Provider::Connect, QVariantHash(), \
providerParameters);  setResult(success);
         return;
     }


[prev in list] [next in list] [prev in thread] [next in thread]