FCL/sf/app/homescreen: comparison homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsaddtohomescreenstate.cpp

equal deleted inserted replaced

-:2e2dc3d30ca8
+:341166945d65
 #include "caquery.h"
 #include "hsmenuservice.h"
 const char SHORTCUT_WIDGET_URI[] = "hsshortcutwidgetplugin";
 const char SHORTCUT_ID[] = "caEntryId";
-const char ADD_TO_HOMESCREEN_STATE[] = "AddToHomeScreenState";
 /*!
 \class HsAddToHomeScreenState
 \ingroup group_hsmenustateplugin
 (browsing applications and collections)
 */
 /*!
 Constructor
-\param parent: parent state
+\param parent Parent state.
 \retval void
 */
 HsAddToHomeScreenState::HsAddToHomeScreenState(QState *parent) :
-HsMenuBaseState(ADD_TO_HOMESCREEN_STATE, parent),
+QState(parent),
 mCorruptedMessage(NULL), mConfirmAction(NULL),
 mMenuMode(NormalHsMenuMode),
 mNotifier(0)
 {
-requestServices(QList<QVariant> () << SHORTCUT_SERVICE_KEY
+setObjectName("/AddToHomeScreenState");
-<< CONTENT_SERVICE_KEY);
+if (this->parent()) {
+setObjectName(this->parent()->objectName() + objectName());
+}
 connect(this, SIGNAL(exited()), SLOT(cleanUp()));
 }
 /*!
 Destructor. Empty one.
 \retval void
 */
 void HsAddToHomeScreenState::onEntry(QEvent *event)
 {
 HSMENUTEST_FUNC_ENTRY("HsAddToHomeScreenState::onEntry");
-HsMenuBaseState::onEntry(event);
+QState::onEntry(event);
 HsMenuEvent *menuEvent = static_cast<HsMenuEvent *>(event);
 QVariantMap data = menuEvent->data();
 mEntryId = data.value(itemIdKey()).toInt();
 QSharedPointer<CaEntry> entry = CaService::instance()->getEntry(mEntryId);
 const QString entryTypeName = entry->entryTypeName();
 mMenuMode = static_cast<HsMenuMode>(data.value(menuModeType()).toInt());
+mToken = data.value(HOMESCREENDATA);
 bool success = false;
 if (entryTypeName == widgetTypeName()) {
 const QString uri = entry->attribute(widgetUriAttributeName());
-success = addWidget(*contentService(), uri);
+success = addWidget(*HsContentService::instance(), uri);
 HsMenuService::touch(mEntryId);
 } else {
-success = addApplication(*contentService(), *entry);
+success = addApplication(*HsContentService::instance(), *entry);
 }
 if (success && (mMenuMode == NormalHsMenuMode)) {
 HbNotificationDialog *notificationDialog = new HbNotificationDialog();
 notificationDialog->setAttribute(Qt::WA_DeleteOnClose);
 const QString &uri)
 {
 HSMENUTEST_FUNC_ENTRY("HsAddToHomeScreenState::addWidget");
 QVariantHash params;
 params[URI] = uri;
+params[HOMESCREENDATA] = mToken;
 bool success = contentService.createWidget(params);
 if (!success) {
 subscribeForMemoryCardRemove();
 showMessageWidgetCorrupted();
 } else {
 /*!
 Shows message about corrupted widget library. Deletes widget eventually
 \param itemId entryId of widget (needed to delete it)
 \retval void
 */
-#ifdef COVERAGE_MEASUREMENT
-#pragma CTC SKIP
-#endif //COVERAGE_MEASUREMENT
 void HsAddToHomeScreenState::showMessageWidgetCorrupted()
 {
 HSMENUTEST_FUNC_ENTRY("HsCollectionState::showMessageWidgetCorrupted");
 mCorruptedMessage = new HbMessageBox(HbMessageBox::MessageTypeQuestion);
 mCorruptedMessage->open(this, SLOT(messageWidgetCorruptedFinished(HbAction*)));
 HSMENUTEST_FUNC_EXIT("HsCollectionState::showMessageWidgetCorrupted");
 }
-#ifdef COVERAGE_MEASUREMENT
-#pragma CTC ENDSKIP
-#endif //COVERAGE_MEASUREMENT
 /*!
 Slot launched on dismissing the corrupted widget error note
 \retval void
 */
 SIGNAL(entryChanged(CaEntry,ChangeType)),
 this, SLOT(memoryCardRemoved()));
 delete mNotifier;
 mNotifier = NULL;
+mToken = NULL;
 }
 /*!
 Adds a shortcut to active page of home screen
 QVariantHash params;
 params[URI] = SHORTCUT_WIDGET_URI;
 QVariantHash preferences;
 preferences[SHORTCUT_ID] = QString::number(mEntryId);
 params[PREFERENCES] = preferences;
+params[HOMESCREENDATA] = mToken;
 const bool result = contentService.createWidget(params);
 logActionResult("Adding shortcut", mEntryId, result);
 HSMENUTEST_FUNC_EXIT("HsAddToHomeScreenState::addShortcut");
 return result;
 }
 if (key.contains(widgetParam())) {
 preferences.insert(key.remove(widgetParam()),value);
 }
 }
 params[PREFERENCES] = preferences;
+params[HOMESCREENDATA] = mToken;
 success = contentService.createWidget(params);
 if (!success) {
 success = addShortcut(contentService);
 }

changeset 62	341166945d65
parent 55	03646e8da489
child 63	52b0f64eeb51