diff -r 8e5041d13c84 -r 32469d7d46ff activityfw/orbitintegration/hbactivityplugin/hbactivityplugin.cpp --- a/activityfw/orbitintegration/hbactivityplugin/hbactivityplugin.cpp Fri Apr 16 15:16:09 2010 +0300 +++ b/activityfw/orbitintegration/hbactivityplugin/hbactivityplugin.cpp Mon May 03 12:48:45 2010 +0300 @@ -11,7 +11,7 @@ * * Contributors: * -* Description: +* Description: * */ @@ -25,7 +25,7 @@ HbActivityPlugin::HbActivityPlugin(QObject *parent) : HbActivityPluginInterface(parent), mActivityClient(0) { QServiceManager serviceManager; - + if (serviceManager.findInterfaces("ActivityService").isEmpty()) { // clean old entries serviceManager.removeService("ActivityService"); @@ -35,11 +35,11 @@ } } - mActivityClient = serviceManager.loadInterface("com.nokia.qt.activities.ActivityClient"); + mActivityClient = serviceManager.loadInterface("com.nokia.qt.activities.ActivityClient"); if (!mActivityClient) { qWarning("Cannot initialize critical com.nokia.qt.activities.ActivityClient service."); } - + connect(mActivityClient, SIGNAL(activityRequested(QString)), this, SIGNAL(activityRequested(QString))); } @@ -51,11 +51,11 @@ bool HbActivityPlugin::addActivity(const QString &activityId, const QVariant &data, const QVariantHash ¶meters) { bool retVal(false); - QMetaObject::invokeMethod(mActivityClient, - "addActivity", - Q_RETURN_ARG(bool, retVal), - Q_ARG(QString, activityId), - Q_ARG(QVariant, data), + QMetaObject::invokeMethod(mActivityClient, + "addActivity", + Q_RETURN_ARG(bool, retVal), + Q_ARG(QString, activityId), + Q_ARG(QVariant, data), Q_ARG(QVariantHash, parameters)); return retVal; } @@ -63,9 +63,9 @@ bool HbActivityPlugin::removeActivity(const QString &activityId) { bool retVal(false); - QMetaObject::invokeMethod(mActivityClient, - "removeActivity", - Q_RETURN_ARG(bool, retVal), + QMetaObject::invokeMethod(mActivityClient, + "removeActivity", + Q_RETURN_ARG(bool, retVal), Q_ARG(QString, activityId)); return retVal; } @@ -73,9 +73,9 @@ bool HbActivityPlugin::updateActivity(const QString &activityId, const QVariant &data, const QVariantHash ¶meters) { bool retVal(false); - QMetaObject::invokeMethod(mActivityClient, - "updateActivity", - Q_RETURN_ARG(bool, retVal), + QMetaObject::invokeMethod(mActivityClient, + "updateActivity", + Q_RETURN_ARG(bool, retVal), Q_ARG(QString, activityId), Q_ARG(QVariant, data), Q_ARG(QVariantHash, parameters)); @@ -84,8 +84,8 @@ QList HbActivityPlugin::activities() { QList data; - QMetaObject::invokeMethod(mActivityClient, - "activities", + QMetaObject::invokeMethod(mActivityClient, + "activities", Q_RETURN_ARG(QList, data)); return data; } @@ -93,8 +93,8 @@ QVariant HbActivityPlugin::activityData(const QString &activityId) { QVariant data; - QMetaObject::invokeMethod(mActivityClient, - "activityData", + QMetaObject::invokeMethod(mActivityClient, + "activityData", Q_RETURN_ARG(QVariant, data), Q_ARG(QString, activityId)); return data; @@ -103,10 +103,20 @@ bool HbActivityPlugin::waitActivity() { bool retVal(false); - QMetaObject::invokeMethod(mActivityClient, - "waitActivity", + QMetaObject::invokeMethod(mActivityClient, + "waitActivity", Q_RETURN_ARG(bool, retVal)); return retVal; } -Q_EXPORT_PLUGIN2(hbactivityplugin, HbActivityPlugin) +QVariantHash HbActivityPlugin::parseCommandLine(const QStringList &commandLineParams) +{ + QVariantHash retVal; + QMetaObject::invokeMethod(mActivityClient, + "parseCommandLine", + Q_RETURN_ARG(QVariantHash, retVal), + Q_ARG(QStringList, commandLineParams)); + return retVal; +} + +Q_EXPORT_PLUGIN2(hbactivityplugin, HbActivityPlugin)