diff -r ffa4311257f6 -r e7f34e614544 uiservicetab/vimpstui/src/cvimpstuisinglelistboxtabviewcontrol.cpp --- a/uiservicetab/vimpstui/src/cvimpstuisinglelistboxtabviewcontrol.cpp Wed Sep 15 11:57:55 2010 +0300 +++ b/uiservicetab/vimpstui/src/cvimpstuisinglelistboxtabviewcontrol.cpp Wed Oct 13 14:16:29 2010 +0300 @@ -75,16 +75,14 @@ MVIMPSTCmdHandler& aCommandHandler, TUint32 aServiceId, CVIMPSTUiBrandData& aBrandHandler, - MVIMPSTEngine& aEngine, - CEikButtonGroupContainer* aCba) + MVIMPSTEngine& aEngine ) :iTabbedView(aTabbedView), iKeyEventHandler(aKeyEventHandler), iCommandHandler(aCommandHandler), iArrayProcess(iCommandHandler.GetProcessInterface()), iServiceId(aServiceId), iBrandHandler(aBrandHandler), - iEngine(aEngine), - iCba(aCba) + iEngine(aEngine) { } @@ -156,12 +154,11 @@ (CVIMPSTUiTabbedView& aTabbedView,MPbk2KeyEventHandler* aKeyEventHandler, MVIMPSTCmdHandler& aCommandHandler, TUint32 aServiceId, CVIMPSTUiBrandData& aBrandHandler, - MVIMPSTEngine& aEngine, - CEikButtonGroupContainer* aCba) + MVIMPSTEngine& aEngine) { TRACER_AUTO; CVIMPSTUiSingleListBoxTabViewControl* self = NewLC(aTabbedView,aKeyEventHandler, - aCommandHandler, aServiceId, aBrandHandler,aEngine,aCba); + aCommandHandler, aServiceId, aBrandHandler,aEngine); CleanupStack::Pop(self); return self; } @@ -175,13 +172,12 @@ (CVIMPSTUiTabbedView& aTabbedView,MPbk2KeyEventHandler* aKeyEventHandler, MVIMPSTCmdHandler& aCommandHandler, TUint32 aServiceId, CVIMPSTUiBrandData& aBrandHandler, - MVIMPSTEngine& aEngine, - CEikButtonGroupContainer* aCba) + MVIMPSTEngine& aEngine) { TRACER_AUTO; CVIMPSTUiSingleListBoxTabViewControl* self = new (ELeave) CVIMPSTUiSingleListBoxTabViewControl(aTabbedView,aKeyEventHandler, - aCommandHandler, aServiceId, aBrandHandler,aEngine,aCba); + aCommandHandler, aServiceId, aBrandHandler,aEngine); CleanupStack::PushL(self); self->ConstructL(); return self; @@ -1030,10 +1026,10 @@ TVIMPSTEnums::TItem itemtype = iArrayProcess.GetType(index); TVIMPSTEnums::TVIMPSTRegistrationState servicestate = iEngine.ServiceState(); TBool updateinvalid( iLastFocusedItemType == TVIMPSTEnums::EInvalid ); -// if ( !iCba ) -// { -// iCba = CEikButtonGroupContainer::Current(); -// } + if ( !iCba ) + { + iCba = CEikButtonGroupContainer::Current(); + } // default softkeys if( aUseDefaultCba || updateinvalid )