diff -r 4b195f3bea29 -r 35368b604b28 homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hscollectionnamestate.cpp --- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hscollectionnamestate.cpp Wed Aug 18 09:40:07 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hscollectionnamestate.cpp Thu Sep 02 20:17:27 2010 +0300 @@ -97,7 +97,7 @@ HsMenuEvent *menuEvent = static_cast(event); QVariantMap data = menuEvent->data(); - mItemId = data.value(itemIdKey()).toInt(); + mItemId = data.value(Hs::itemIdKey).toInt(); } mCollectionNameDialog = new HsCollectionNameDialog(mItemId); mCollectionNameDialog->open(this, SLOT(dialogFinished(HbAction*))); @@ -120,7 +120,8 @@ HsMenuService::createCollection(newName); } } - mCollectionNameDialog = NULL; //set to NULL since this will be deleted atfer close + //set to NULL since this will be deleted atfer close + mCollectionNameDialog = NULL; emit exit(); } @@ -130,7 +131,8 @@ void HsCollectionNameState::cleanUp() { if (mCollectionNameDialog) { - disconnect(mCollectionNameDialog, SIGNAL(finished(HbAction*)), this, SLOT(dialogFinished(HbAction*))); + disconnect(mCollectionNameDialog, SIGNAL(finished(HbAction*)), + this, SLOT(dialogFinished(HbAction*))); mCollectionNameDialog->close(); mCollectionNameDialog = NULL; }