diff -r 76a2435edfd4 -r de1630741fbe phonebookui/pbkcommonui/src/cntfavoritesview.cpp --- a/phonebookui/pbkcommonui/src/cntfavoritesview.cpp Fri Apr 16 14:53:18 2010 +0300 +++ b/phonebookui/pbkcommonui/src/cntfavoritesview.cpp Mon May 03 12:24:20 2010 +0300 @@ -26,10 +26,10 @@ const char *CNT_FAVORITE_UI_XML = ":/xml/contacts_favorite.docml"; CntFavoritesView::CntFavoritesView() : - mContact(0), - mView(0), - mSoftkey(0), - mViewManager(0) + mContact(NULL), + mView(NULL), + mSoftkey(NULL), + mViewManager(NULL) { bool ok = false; mDocumentLoader.load(CNT_FAVORITE_UI_XML, &ok); @@ -58,7 +58,7 @@ mContact = 0; } -void CntFavoritesView::activate( CntAbstractViewManager* aMgr, const CntViewParameters& aArgs ) +void CntFavoritesView::activate( CntAbstractViewManager* aMgr, const CntViewParameters aArgs ) { if (mView->navigationAction() != mSoftkey) mView->setNavigationAction(mSoftkey); @@ -67,7 +67,7 @@ connect(window, SIGNAL(orientationChanged(Qt::Orientation)), this, SLOT(setOrientation(Qt::Orientation))); setOrientation(window->orientation()); - mContact = new QContact(aArgs.selectedContact()); + mContact = new QContact(aArgs.value(ESelectedContact).value()); mViewManager = aMgr; HbPushButton *addButton = static_cast(mDocumentLoader.findWidget(QString("cnt_button_add"))); @@ -90,8 +90,12 @@ { groupSelectionPopup->saveOldGroup(); delete groupSelectionPopup; - CntViewParameters viewParameters(CntViewParameters::FavoritesMemberView); - viewParameters.setSelectedContact(*mContact); + + CntViewParameters viewParameters; + viewParameters.insert(EViewId, FavoritesMemberView); + QVariant var; + var.setValue(*mContact); + viewParameters.insert(ESelectedContact, var); mViewManager->changeView(viewParameters); } else if (action == groupSelectionPopup->secondaryAction())