--- a/activityfw/activityserviceplugin/activitymanager_p.cpp Fri Apr 16 14:45:49 2010 +0300
+++ b/activityfw/activityserviceplugin/activitymanager_p.cpp Fri Apr 30 15:22:08 2010 +0300
@@ -25,6 +25,10 @@
{
mServerClient = new HsActivityDbClient();
mServerClient->connect();
+ connect(mServerClient,
+ SIGNAL(thumbnailRequested(QPixmap, void *)),
+ q,
+ SIGNAL(thumbnailReady(QPixmap, void *)));
}
ActivityManagerPrivate::~ActivityManagerPrivate()
@@ -46,7 +50,7 @@
if (uriMatcher.indexIn(uri) != -1) {
QStringList list = uriMatcher.capturedTexts();
Q_ASSERT(list.count() == 3);
- launchActivity(list.at(1).toInt(), list.at(2));
+ launchActivity(list.at(1).toUInt(0, 16), list.at(2));
} else {
qWarning("Activity URI parsing error");
}
@@ -66,24 +70,7 @@
}
}
-void ActivityManagerPrivate::removeActivity(int applicationId, const QString &activityId)
-{
- QVariantHash activity;
- activity.insert(ActivityApplicationKeyword, applicationId);
- activity.insert(ActivityActivityKeyword, activityId);
- mServerClient->removeActivity(activity);
-}
-
-void ActivityManagerPrivate::removeApplicationActivities(int applicationId)
+void ActivityManagerPrivate::getThumbnail(QSize resolution,const QString &thumbnailPath, void *data)
{
- QVariantHash activity;
- activity.insert(ActivityApplicationKeyword, applicationId);
- mServerClient->removeApplicationActivities(activity);
+ mServerClient->getThumbnail(resolution, thumbnailPath, "image/png", data);
}
-
-void ActivityManagerPrivate::getThumbnail(const QString &thumbnailId, void *userData)
-{
- QPixmap ico;
- mServerClient->getThumbnail(ico, thumbnailId);
- emit q_ptr->thumbnailReady(ico, userData);
-}