--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hspreviewhswidgetstate.cpp	Fri Aug 13 14:38:12 2010 +0300
+++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hspreviewhswidgetstate.cpp	Wed Aug 18 10:33:57 2010 +0300
@@ -105,13 +105,13 @@
     HsMenuEvent *menuEvent = static_cast<HsMenuEvent *>(event);
    
     QVariantMap data = menuEvent->data();
-    mEntryId = data.value(itemIdKey()).toInt();
-    mToken = data.value(HOMESCREENDATA);
+    mEntryId = data.value(Hs::itemIdKey).toInt();
+    mToken = data.value(Hs::homescreenData);
     
         
     QSharedPointer<CaEntry> entry =
         CaService::instance()->getEntry(mEntryId);
-    mUri = entry->attribute(widgetUriAttributeName());
+    mUri = entry->attribute(Hs::widgetUriAttributeName);
     mPreviewDialog = buildPreviewDialog(*entry);
     mAddToHomescreenAction = mPreviewDialog->actions().value(0);
     
@@ -159,8 +159,8 @@
     if (finishedAction == mAddToHomescreenAction) {
 
         QVariantHash widgetData;
-        widgetData[URI] = mUri;
-        widgetData[HOMESCREENDATA] = mToken;
+        widgetData[Hs::uri] = mUri;
+        widgetData[Hs::homescreenData] = mToken;
         
         bool success = HsContentService::instance()->createWidget(widgetData);
         
@@ -207,7 +207,7 @@
     mCorruptedMessage = NULL;
 	
     if (static_cast<QAction*>(finishedAction) == mConfirmRemovalAction) {
-        HsMenuService::executeAction(mEntryId, removeActionIdentifier());
+        HsMenuService::executeAction(mEntryId, Hs::removeActionIdentifier);
     }
     emit exit();