--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsarrangestate.cpp	Fri Aug 13 14:38:12 2010 +0300
+++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsarrangestate.cpp	Wed Aug 18 10:33:57 2010 +0300
@@ -141,7 +141,7 @@
     HsMenuEvent *menuEvent = static_cast<HsMenuEvent *>(event);
     QVariantMap data = menuEvent->data();
 
-    mTopItemId = data.value(itemIdKey()).toInt();
+    mTopItemId = data.value(Hs::itemIdKey).toInt();
 
     HbDocumentLoader loader;
     bool loadStatusOk = false;
@@ -160,10 +160,10 @@
     if (mEntriesList && mDialog) {
         switch (menuEvent->operation()) {
         case HsMenuEvent::ArrangeCollection:
-            mCollectionId = data.value(collectionIdKey()).toInt();
+            mCollectionId = data.value(Hs::collectionIdKey).toInt();
             mItemModel = HsMenuService::getCollectionModel(
                 mCollectionId,
-                NoHsSortAttribute);
+                Hs::NoHsSortAttribute);
             break;
         case HsMenuEvent::ArrangeAllCollections:
             mCollectionId = HsMenuService::allCollectionsId();