diff -r d508aa856878 -r d30183af6ca6 phonebookui/pbkcommonui/src/cntgroupactionsview.cpp --- a/phonebookui/pbkcommonui/src/cntgroupactionsview.cpp Wed Aug 11 09:06:35 2010 +0300 +++ b/phonebookui/pbkcommonui/src/cntgroupactionsview.cpp Mon Aug 23 16:06:28 2010 +0300 @@ -38,7 +38,6 @@ #include #include #include "cntactionlauncher.h" - #include #include @@ -123,13 +122,13 @@ /* Activates a default view and setup name label texts */ -void CntGroupActionsView::activate( CntAbstractViewManager* aMgr, const CntViewParameters aArgs ) +void CntGroupActionsView::activate( const CntViewParameters aArgs ) { if (mView->navigationAction() != mSoftkey) mView->setNavigationAction(mSoftkey); mGroupContact = new QContact(aArgs.value(ESelectedGroupContact).value()); - mViewManager = aMgr; + mViewManager = &mEngine->viewManager(); QContactName contactName = mGroupContact->detail( QContactName::DefinitionName ); QString groupName = contactName.value( QContactName::FieldCustomLabel ); @@ -210,10 +209,11 @@ mMessageActionParams.clear(); QString action = mModel->item(index.row())->data(Qt::UserRole+1).toString(); + QContactManager& mgr = mEngine->contactManager( SYMBIAN_BACKEND ); //conference call if (action.compare("call", Qt::CaseInsensitive) == 0 ) { - CntActionLauncher* other = new CntActionLauncher(*mViewManager->contactManager(SYMBIAN_BACKEND), action); + CntActionLauncher* other = new CntActionLauncher( mgr, action); connect(other, SIGNAL(actionExecuted(CntActionLauncher*)), this, SLOT(actionExecuted(CntActionLauncher*))); other->execute(*mGroupContact, QContactDetail()); } @@ -223,10 +223,10 @@ relationshipFilter.setRelationshipType(QContactRelationship::HasMember); relationshipFilter.setRelatedContactRole(QContactRelationship::First); relationshipFilter.setRelatedContactId(mGroupContact->id()); - QList groupMembers = mViewManager->contactManager(SYMBIAN_BACKEND)->contactIds(relationshipFilter); + QList groupMembers = mgr.contactIds(relationshipFilter); for (int i = 0;icontactManager(SYMBIAN_BACKEND)->contact(groupMembers.at(i)); + QContact contact = mgr.contact(groupMembers.at(i)); QContactDetail preferredDetail = contact.preferredDetail(action); //use preferred detail if exits if (!preferredDetail.isEmpty()) { @@ -265,7 +265,7 @@ params.setValue(mEmailActionParams); } map.insert(action,params); - CntActionLauncher* other = new CntActionLauncher(*mViewManager->contactManager(SYMBIAN_BACKEND), action); + CntActionLauncher* other = new CntActionLauncher(mgr, action); connect(other, SIGNAL(actionExecuted(CntActionLauncher*)), this, SLOT(actionExecuted(CntActionLauncher*))); other->execute(*mGroupContact, QContactDetail(), map); } @@ -299,7 +299,7 @@ } map.insert(action,params); - CntActionLauncher* other = new CntActionLauncher(*mViewManager->contactManager(SYMBIAN_BACKEND), action); + CntActionLauncher* other = new CntActionLauncher( mEngine->contactManager(SYMBIAN_BACKEND), action); connect(other, SIGNAL(actionExecuted(CntActionLauncher*)), this, SLOT(actionExecuted(CntActionLauncher*))); other->execute(*mGroupContact, QContactDetail(), map); } @@ -345,7 +345,7 @@ mIsExecutingAction = true; } - CntActionLauncher* other = new CntActionLauncher(*mViewManager->contactManager(SYMBIAN_BACKEND), aAction); + CntActionLauncher* other = new CntActionLauncher( mEngine->contactManager(SYMBIAN_BACKEND), aAction); connect(other, SIGNAL(actionExecuted(CntActionLauncher*)), this, SLOT(actionExecuted(CntActionLauncher*))); other->execute(aContact, aDetail); }