diff -r 15e4dd19031c -r a0713522ab97 idlefw/src/framework/aicpsexecuteparam.cpp --- a/idlefw/src/framework/aicpsexecuteparam.cpp Wed Mar 31 22:04:35 2010 +0300 +++ b/idlefw/src/framework/aicpsexecuteparam.cpp Wed Apr 14 16:16:44 2010 +0300 @@ -105,18 +105,14 @@ } // --------------------------------------------------------------------------- -// CAiCpsExecuteParam::InParamListLC +// CAiCpsExecuteParam::InParamMapLC // // --------------------------------------------------------------------------- // -CLiwGenericParamList* CAiCpsExecuteParam::InParamListLC() +CLiwDefaultMap* CAiCpsExecuteParam::InParamMapLC() { - CLiwGenericParamList* paramList = CLiwGenericParamList::NewLC(); - - TLiwGenericParam pluginId( KPluginId, TLiwVariant( iPluginId ) ); - paramList->AppendL( pluginId ); - TLiwGenericParam type( KType, TLiwVariant( iRegistryType ) ); - paramList->AppendL( type ); + CLiwDefaultMap* inParamMap = CLiwDefaultMap::NewLC(); + inParamMap->InsertL( KType, TLiwVariant( *iRegistryType )); CLiwDefaultMap* filter = CLiwDefaultMap::NewLC(); filter->InsertL( KPublisherId, TLiwVariant(iPublisher )); @@ -129,12 +125,11 @@ actionsToLaunch->AppendL( TLiwVariant( *iActions[i])); } filter->InsertL(KActionTrigger, TLiwVariant(actionsToLaunch) ); - - TLiwGenericParam item( KFilter, TLiwVariant( filter )); - paramList->AppendL( item ); + inParamMap->InsertL( KFilter, TLiwVariant( filter )); + CleanupStack::PopAndDestroy( actionsToLaunch ); CleanupStack::PopAndDestroy( filter ); - return paramList; + return inParamMap; } // ---------------------------------------------------------------------------