FCL/sf/mw/classicui: comparison applicationinterworkingfw/ServiceHandler/src/AiwServiceHandlerImpl.cpp

equal deleted inserted replaced

-:fcdfafb36fe7
+:aecbbf00d063
 #include "AiwCommon.hrh"
 #include "AiwMenuSlot.hrh"
 #include "AiwEcomMonitor.h"
 #include "AiwTlsData.h"
 #include "data_caging_path_literals.hrh"
-#include "../../../uifw/inc/akntrace.h"
 // CONSTANTS
 // Max number of empty menu resource slots.
 const TInt KMaxMenuResources = 16;
 // AiwServiceHandler
 //
 CAiwServiceHandlerImpl* CAiwServiceHandlerImpl::NewL()
 {
-_AKNTRACE_FUNC_ENTER;
 CAiwServiceHandlerImpl* handler = new (ELeave) CAiwServiceHandlerImpl();
 CleanupStack::PushL( handler );
 handler->ConstructL();
 CleanupStack::Pop(); // handler
-_AKNTRACE_FUNC_EXIT;
 return handler;
 }
 CAiwServiceHandlerImpl::~CAiwServiceHandlerImpl()
 {
-_AKNTRACE_FUNC_ENTER;
 if (iResourceOffset && iCoeEnv)
 {
 iCoeEnv->DeleteResourceFile(iResourceOffset);
 }
 Reset();
 {
 CAiwTlsData* data = CAiwTlsData::Instance();
 data->RemoveMenuLaunchObserver( this );
 CAiwTlsData::Close();
 }
-_AKNTRACE_FUNC_EXIT;
 }
 void CAiwServiceHandlerImpl::Reset()
 {
-_AKNTRACE_FUNC_ENTER;
-RProcess pro;
-AknTracePrint(_L("process name:%S"),&(pro.FileName()));
 iInterestList.ResetAndDestroy();
 iMenuBindings.ResetAndDestroy();
 iBaseBindings.ResetAndDestroy();
 iProviders.ResetAndDestroy();
 delete iInParams;
 iInParams = NULL;
 delete iOutParams;
 iOutParams = NULL;
-_AKNTRACE_FUNC_EXIT;
 }
 void CAiwServiceHandlerImpl::ListProvidersForCriteriaL(RArray<TInt>& aResult,
 CAiwCriteriaItem& aItem)
 {
-_AKNTRACE_FUNC_ENTER;
 TInt i;
 for (i = 0; i < iProviders.Count(); i++)
 {
 if (iProviders[i]->HasCriteria(aItem))
 {
 User::LeaveIfError(aResult.Append(iProviders[i]->ImplementationUid().iUid));
 }
 }
-_AKNTRACE_FUNC_EXIT;
 }
 TInt CAiwServiceHandlerImpl::NbrOfProviders(const CAiwCriteriaItem* aCriteria)
 {
-_AKNTRACE_FUNC_ENTER;
 if(!aCriteria)
 {
 return 0;
 }
 return iMenuBindings[i]->NumberOfProviders();
 }
 }
 }
-_AKNTRACE_FUNC_EXIT;
 return 0;
 }
 void CAiwServiceHandlerImpl::AttachL(TInt aInterestResourceId)
 {
-_AKNTRACE_FUNC_ENTER;
-_AKNTRACE("aInterestResourceId:%x",aInterestResourceId);
 // CCoeEnv/CEikonEnv needs to be accessible.
 if(!iCoeEnv)
 {
 User::Leave(KErrNotSupported);
 }
 filtered.Reset();
 CleanupStack::Pop(); // filtered
 CleanupStack::Pop(); // interest
-_AKNTRACE_FUNC_EXIT;
 }
 void CAiwServiceHandlerImpl::AttachL(const RCriteriaArray& aInterest)
 {
-_AKNTRACE_FUNC_ENTER;
 RCriteriaArray interest, filtered;
 CleanupStack::PushL( TCleanupItem( InterestCleanup, &interest ) );
 CleanupStack::PushL( TCleanupItem( FilteredCleanup, &filtered ) );
 item->SetServiceClass(     aInterest[i]->ServiceClass()          );
 item->SetOptions(          aInterest[i]->Options()               );
 item->SetDefaultProvider( (aInterest[i]->DefaultProvider()).iUid );
 item->SetMaxProviders(     aInterest[i]->MaxProviders()          );
-_AKNTRACE("aInterest[i]->Id():%x",aInterest[i]->Id());
-_AKNTRACE("aInterest[i]->ServiceCmd():%x",aInterest[i]->ServiceCmd());
-_AKNTRACE("aInterest[i]->ServiceClass():%x",aInterest[i]->ServiceClass());
-_AKNTRACE("(aInterest[i]->DefaultProvider()).iUid:%x",(aInterest[i]->DefaultProvider()).iUid);
-_AKNTRACE("aInterest[i]->MaxProviders():%x",aInterest[i]->MaxProviders());
 User::LeaveIfError(interest.Append(item));
 CleanupStack::Pop(item);
 }
 FilterInterestListL(interest, filtered);
 filtered.Reset();
 CleanupStack::Pop(); // filtered
 CleanupStack::Pop(); // interest
-_AKNTRACE_FUNC_EXIT;
 }
 void CAiwServiceHandlerImpl::DoAttachL(const RCriteriaArray& aInterest)
 {
-_AKNTRACE_FUNC_ENTER;
-RProcess pro;
-AknTracePrint(_L("process name:%S"),&(pro.FileName()));
 CAiwBinding* bind;
 for (TInt i = 0; i < aInterest.Count(); i++)
 {
 bind = CAiwBinding::NewLC();
 else
 {
 CleanupStack::PopAndDestroy(); // bind
 }
 }
-_AKNTRACE_FUNC_EXIT;
 }
 void CAiwServiceHandlerImpl::GetInterest(RCriteriaArray& aInterest)
 {
-_AKNTRACE_FUNC_ENTER;
 for (TInt i = 0; i < iInterestList.Count(); i++)
 {
 if (aInterest.Append(iInterestList[i]) != KErrNone)
 {
 return;
 }
 }
-_AKNTRACE_FUNC_EXIT;
 }
 void CAiwServiceHandlerImpl::DetachL(const RCriteriaArray& aInterest)
 {
-_AKNTRACE_FUNC_ENTER;
 // First, remove relevant criteria items from relevat base bindings.
 for (TInt i = 0; i < aInterest.Count(); i++)
 {
 for (TInt j = 0; j < iBaseBindings.Count(); j++)
 {
 // Then check if there were left obselete criteria items and remove them.
 RemoveObsoleteCriteriaItems();
 // Finally check if there were left obselete providers and remove them.
 RemoveObsoleteProviders();
-_AKNTRACE_FUNC_EXIT;
 }
 void CAiwServiceHandlerImpl::DetachL(TInt aInterestResourceId)
 {
-_AKNTRACE_FUNC_ENTER;
-_AKNTRACE("aInterestResourceId:%x",aInterestResourceId);
 // CCoeEnv/CEikonEnv needs to be accessible.
 if(!iCoeEnv)
 {
 User::Leave(KErrNotSupported);
 }
 DetachL( interest );
 interest.ResetAndDestroy();
 CleanupStack::Pop(); // interest
-_AKNTRACE_FUNC_EXIT;
 }
 const CAiwCriteriaItem* CAiwServiceHandlerImpl::GetCriteria(TInt aId)
 {
-_AKNTRACE_FUNC_ENTER;
 for (TInt i = 0; i < iInterestList.Count(); i++)
 {
 if (iInterestList[i]->Id() == aId)
 {
 return iInterestList[i];
 }
 }
-_AKNTRACE_FUNC_EXIT;
 return NULL;
 }
 TInt CAiwServiceHandlerImpl::NumAlreadyInitializedPaneIdsL() const
 {
-_AKNTRACE_FUNC_ENTER;
 TInt ret = 0;
 TInt paneIds[KMaxPaneIds] = {0};
 TBool found = EFalse;
 for (TInt i = 0; i < iLastInitialized.Count(); i++)
 }
 paneIds[ret] = iLastInitialized[i]->MenuResourceId();
 ret++;
 }
 }
-_AKNTRACE_FUNC_EXIT;
 return ret;
 }
 void CAiwServiceHandlerImpl::InitializeMenuPaneL(
 CEikMenuPane& aMenuPane,
 TInt aMenuResourceId,
 TInt aBaseMenuCmdId,
 const CAiwGenericParamList& aInParamList)
 {
-_AKNTRACE_FUNC_ENTER;
 InitializeMenuPaneL(aMenuPane, aMenuResourceId, aBaseMenuCmdId,
 aInParamList, EFalse, EFalse);
-_AKNTRACE_FUNC_EXIT;
 }
 void CAiwServiceHandlerImpl::InitializeMenuPaneL(
 CEikMenuPane& aMenuPane,
 TInt aMenuResourceId,
 TInt aBaseMenuCmdId,
 const CAiwGenericParamList& aInParamList,
 TBool aUseSubmenuTextsIfAvailable)
 {
-_AKNTRACE_FUNC_ENTER;
 InitializeMenuPaneL(aMenuPane, aMenuResourceId, aBaseMenuCmdId, aInParamList, aUseSubmenuTextsIfAvailable, EFalse);
-_AKNTRACE_FUNC_EXIT;
 }
 void CAiwServiceHandlerImpl::InitializeMenuPaneL(
 CEikMenuPane& aMenuPane,
 TInt aBaseMenuCmdId,
 const CAiwGenericParamList& aInParamList,
 TBool aUseSubmenuTextsIfAvailable,
 TBool aSetAsItemSpecific)
 {
-_AKNTRACE_FUNC_ENTER;
-_AKNTRACE("aMenuPane:%x",&aMenuPane);
-_AKNTRACE("aMenuResourceId:%x",aMenuResourceId);
-_AKNTRACE("aBaseMenuCmdId:%x",aBaseMenuCmdId);
-_AKNTRACE("aUseSubmenuTextsIfAvailable:%x",aUseSubmenuTextsIfAvailable);
-_AKNTRACE("aSetAsItemSpecific:%x",aSetAsItemSpecific);
-TInt count = aInParamList.Count();
-for(TInt i=0;i<count;i++)
-{
-_AKNTRACE("i:%d, InParamList[i].SemanticId():%x",i,aInParamList[i].SemanticId());
-AknTracePrint(_L("i:%d, InParamList[i].Value():%S"),i,&(aInParamList[i].Value().AsDes()));
-}
 // CCoeEnv/CEikonEnv needs to be accessible.
 if(!iCoeEnv)
 {
 User::Leave(KErrNotSupported);
 }
 User::LeaveIfError(iMenuPanes.Append(aiwPane));
 CleanupStack::Pop(); // aiwPane
 }
 }
 }
-_AKNTRACE_FUNC_EXIT;
 }
 TInt CAiwServiceHandlerImpl::ServiceCmdByMenuCmd(TInt aMenuCmdId) const
 {
-_AKNTRACE_FUNC_ENTER;
-_AKNTRACE("aMenuCmdId:%x",aMenuCmdId);
 for (TInt i = 0; i < iMenuBindings.Count(); i++)
 {
 if ((IsInLastInitialized(iMenuBindings[i]->MenuPane())) &&
 (iMenuBindings[i]->MenuPane()->IsCmdInRange(KPlaceholderCmdIdRange, aMenuCmdId)))
 {
 return iMenuBindings[i]->MenuPane()->ServiceCmdId(aMenuCmdId);
 }
 }
-_AKNTRACE_FUNC_EXIT;
 return 0;
 }
 const CAiwGenericParamList& aInParamList,
 CAiwGenericParamList& aOutParamList,
 TUint aCmdOptions,
 MAiwNotifyCallback* aCallback)
 {
-_AKNTRACE_FUNC_ENTER;
-_AKNTRACE("aMenuCmdId:%x",aMenuCmdId);
-RProcess pro;
-AknTracePrint(_L("process name:%S"),&(pro.FileName()));
-TInt count = aInParamList.Count();
-for (TInt i = 0; i < count; i++)
-{
-_AKNTRACE("i:%d, InParamList[i].SemanticId():%x",i,aInParamList[i].SemanticId());
-AknTracePrint(_L("i:%d, InParamList[i].Value():%S"),i,&(aInParamList[i].Value().AsDes()));
-}
-count = iProviders.Count();
-for (TInt i = 0; i < count; i++)
-{
-AknTracePrint(_L("i:%d, iProviders[i]->ImplementationUid():%x"),i,iProviders[i]->ImplementationUid().iUid);
-AknTracePrint(_L("i:%d, iProviders[i]:%x"),i,iProviders[i]);
-}
 // CCoeEnv/CEikonEnv needs to be accessible.
 if(!iCoeEnv)
 {
 User::Leave(KErrNotSupported);
 }
 return;
 }
 }
 }
 }
-_AKNTRACE_FUNC_EXIT;
 }
 void CAiwServiceHandlerImpl::AttachMenuL(TInt aMenuResourceId, TInt aInterestResourceId)
 {
-_AKNTRACE_FUNC_ENTER;
-_AKNTRACE("aMenuResourceId:%x",aMenuResourceId);
-_AKNTRACE("aInterestResourceId:%x",aInterestResourceId);
 // CCoeEnv/CEikonEnv needs to be accessible.
 if(!iCoeEnv)
 {
 User::Leave(KErrNotSupported);
 }
 DoAttachMenuL(reader, aMenuResourceId, filtered);
 filtered.Reset();
 CleanupStack::PopAndDestroy(); // reader
 CleanupStack::Pop(); // filtered
 CleanupStack::Pop(); // interest
-_AKNTRACE_FUNC_EXIT;
 }
 void CAiwServiceHandlerImpl::AttachMenuL(TInt aMenuResourceId, TResourceReader& aReader)
 {
-_AKNTRACE_FUNC_ENTER;
-_AKNTRACE("aMenuResourceId:%x",aMenuResourceId);
 // CCoeEnv/CEikonEnv needs to be accessible.
 if(!iCoeEnv)
 {
 User::Leave(KErrNotSupported);
 }
 DoAttachMenuL(reader, aMenuResourceId, filtered);
 filtered.Reset();
 CleanupStack::PopAndDestroy(); // reader
 CleanupStack::Pop(); // filtered
 CleanupStack::Pop(); // interest
-_AKNTRACE_FUNC_EXIT;
 }
 void CAiwServiceHandlerImpl::AttachMenuL(TInt aMenuResourceId, const RCriteriaArray& aInterest)
 {
-_AKNTRACE_FUNC_ENTER;
-_AKNTRACE("aMenuResourceId:%x",aMenuResourceId);
 // CCoeEnv/CEikonEnv needs to be accessible.
 if(!iCoeEnv)
 {
 User::Leave(KErrNotSupported);
 }
 item->SetServiceClass(     aInterest[i]->ServiceClass()          );
 item->SetOptions(          aInterest[i]->Options()               );
 item->SetDefaultProvider( (aInterest[i]->DefaultProvider()).iUid );
 item->SetMaxProviders(     aInterest[i]->MaxProviders()          );
-_AKNTRACE("aInterest[i]->Id():%x",aInterest[i]->Id());
-_AKNTRACE("aInterest[i]->ServiceCmd():%x",aInterest[i]->ServiceCmd());
-_AKNTRACE("aInterest[i]->ServiceClass():%x",aInterest[i]->ServiceClass());
-_AKNTRACE("(aInterest[i]->DefaultProvider()).iUid:%x",(aInterest[i]->DefaultProvider()).iUid);
-_AKNTRACE("aInterest[i]->MaxProviders():%x",aInterest[i]->MaxProviders());
 User::LeaveIfError(interest.Append(item));
 CleanupStack::Pop(item);
 }
 FilterInterestListL(interest, filtered);
 DoAttachMenuL(reader, aMenuResourceId, filtered);
 filtered.Reset();
 CleanupStack::PopAndDestroy(); // reader
 CleanupStack::Pop(); // filtered
 CleanupStack::Pop(); // interest
-_AKNTRACE_FUNC_EXIT;
 }
 void CAiwServiceHandlerImpl::DoAttachMenuL(TResourceReader& aReader, TInt aMenuId,
 RCriteriaArray& aInterest)
 {
-_AKNTRACE_FUNC_ENTER;
-RProcess pro;
-AknTracePrint(_L("process name:%S"),&(pro.FileName()));
 TInt menuCmd;
 TInt count = aReader.ReadInt16();
 TBool bound;
 for (TInt i = 0; i < count; i++)
 CleanupStack::Pop();  // bind
 }
 }
 SkipMenuFields(aReader);  // Jump to next menu item
 }
-_AKNTRACE_FUNC_EXIT;
 }
 void CAiwServiceHandlerImpl::ReadInterestL(RCriteriaArray& aInterest, TInt aInterestResourceId)
 {
 }
 void CAiwServiceHandlerImpl::DetachMenu(TInt aMenuResourceId, TInt aInterestResourceId)
 {
-_AKNTRACE_FUNC_ENTER;
-_AKNTRACE("aMenuResourceId:%x",aMenuResourceId);
-_AKNTRACE("aInterestResourceId:%x",aInterestResourceId);
 // If interest resource id is null, then detach all items in the given menu.
 if (!aInterestResourceId)
 {
 DoDetachMenu(aMenuResourceId);
 }
 DoDetachMenu(aMenuResourceId, interest);
 interest.ResetAndDestroy();
 }
-_AKNTRACE_FUNC_EXIT;
 }
 void CAiwServiceHandlerImpl::DoDetachMenu(TInt aMenuResourceId)
 {
-_AKNTRACE_FUNC_ENTER;
-_AKNTRACE("aMenuResourceId:%x",aMenuResourceId);
 // First, delete the relevant menu bindings.
 for (TInt i = 0; i < iMenuBindings.Count(); i++)
 {
 if (iMenuBindings[i]->MenuId() == aMenuResourceId)
 {
 // Then check if there were left obselete criteria items and remove them.
 RemoveObsoleteCriteriaItems();
 // Finally check if there were left obselete providers and remove them.
 RemoveObsoleteProviders();
-_AKNTRACE_FUNC_EXIT;
 }
 void CAiwServiceHandlerImpl::DoDetachMenu(TInt aMenuResourceId, RCriteriaArray& aInterest)
 {
-_AKNTRACE_FUNC_ENTER;
-_AKNTRACE("aMenuResourceId:%x",aMenuResourceId);
 // First, remove relevant criteria items from relevant menu bindings.
 for (TInt i = 0; i < iMenuBindings.Count(); i++)
 {
 if (iMenuBindings[i]->MenuId() == aMenuResourceId)
 {
 // Then check if there were left obselete criteria items and remove them.
 RemoveObsoleteCriteriaItems();
 // Finally check if there were left obselete providers and remove them.
 RemoveObsoleteProviders();
-_AKNTRACE_FUNC_EXIT;
 }
 void CAiwServiceHandlerImpl::RemoveObsoleteCriteriaItems()
 {
-_AKNTRACE_FUNC_ENTER;
 for (TInt i = 0; i < iInterestList.Count(); i++)
 {
 CAiwCriteriaItem* criteria = iInterestList[i];
 TBool found = EFalse;
 delete iInterestList[i];
 iInterestList.Remove(i);
 i--;
 }
 }
-_AKNTRACE_FUNC_EXIT;
 }
 void CAiwServiceHandlerImpl::RemoveObsoleteProviders()
 {
-_AKNTRACE_FUNC_ENTER;
 for (TInt i = 0; i < iProviders.Count(); i++)
 {
 CAiwServiceIfBase* provider = iProviders[i];
 TBool found = EFalse;
 delete iProviders[i];
 iProviders.Remove(i);
 i--;
 }
 }
-_AKNTRACE_FUNC_EXIT;
 }
 TBool CAiwServiceHandlerImpl::IsSubMenuEmpty(TInt aSubMenuId)
 {
-_AKNTRACE_FUNC_ENTER;
-_AKNTRACE("aSubMenuId:%d",aSubMenuId);
 for (TInt i = 0; i < iMenuBindings.Count(); i++)
 {
 if (iMenuBindings[i]->MenuId() == aSubMenuId)
 {
 if (iMenuBindings[i]->NumberOfProviders() > 0)
 {
-_AKNTRACE("return false");
-_AKNTRACE_FUNC_EXIT;
 return EFalse;
 }
-_AKNTRACE("return true");
-_AKNTRACE_FUNC_EXIT;
 return ETrue;
 }
 }
-_AKNTRACE_FUNC_EXIT;
 return EFalse;
 }
 CAiwMenuBinding* CAiwServiceHandlerImpl::AlreadyBound(TInt aMenuId, TInt aMenuCmd,
 TInt aMenuItemIndex) const
 {
-_AKNTRACE_FUNC_ENTER;
 for (TInt i = 0; i < iMenuBindings.Count(); i++)
 {
 if ((iMenuBindings[i]->MenuId() == aMenuId) &&
 (iMenuBindings[i]->MenuCmd() == aMenuCmd) &&
 (iMenuBindings[i]->MenuItemIndex() == aMenuItemIndex))
 {
-_AKNTRACE("iMenuBindings[i]:%x",iMenuBindings[i]);
-_AKNTRACE_FUNC_EXIT;
 return iMenuBindings[i];
 }
 }
-_AKNTRACE_FUNC_EXIT;
 return NULL;
 }
 void CAiwServiceHandlerImpl::ExecuteServiceCmdL(
 const CAiwGenericParamList& aInParamList,
 CAiwGenericParamList& aOutParamList,
 TUint aCmdOptions,
 MAiwNotifyCallback* aCallback)
 {
-_AKNTRACE_FUNC_ENTER;
-_AKNTRACE("aCmdId:%x",aCmdId);
-_AKNTRACE("aCmdOptions:%x",aCmdOptions);
-RProcess pro;
-AknTracePrint(_L("process name:%S"),&(pro.FileName()));
-TInt count = aInParamList.Count();
-for (TInt i = 0; i < count; i++)
-{
-_AKNTRACE("i:%d, InParamList[i].SemanticId():%x",i,aInParamList[i].SemanticId());
-AknTracePrint(_L("i:%d, InParamList[i].Value():%S"),i,&(aInParamList[i].Value().AsDes()));
-}
 for (TInt i = 0; i < iBaseBindings.Count(); i++)
 {
 if(iBaseBindings[i]->HasServiceCmd(aCmdId))
 {
 for (TInt j = 0; j < iBaseBindings[i]->NumberOfProviders(); j++)
 aCmdOptions,
 aCallback);
 }
 }
 }
-_AKNTRACE_FUNC_EXIT;
 }
 void CAiwServiceHandlerImpl::ReadInterestListL(TResourceReader& aReader,
 RPointerArray<CAiwCriteriaItem>& aResult)
 {
-_AKNTRACE_FUNC_ENTER;
 const TInt count = aReader.ReadInt16();
 for (TInt ii = 0; ii < count; ++ii)
 {
 CAiwCriteriaItem* item = CAiwCriteriaItem::NewLC();
 item->ReadFromResoureL( aReader );
 User::LeaveIfError(aResult.Append(item));
 CleanupStack::Pop(); // item
 }
-_AKNTRACE_FUNC_EXIT;
 }
 TInt CAiwServiceHandlerImpl::ResolveProvidersL(CAiwBinding* aBinding, CAiwCriteriaItem* aItem)
 {
-_AKNTRACE_FUNC_ENTER;
 RImplInfoPtrArray infoArray;
 TInt result = 0;
 CleanupStack::PushL( TCleanupItem( Cleanup, &infoArray ) );
 }
 }
 CleanupStack::PopAndDestroy(); // infoArray
-_AKNTRACE_FUNC_EXIT;
 return result;
 }
 void CAiwServiceHandlerImpl::FilterInfoArray(RImplInfoPtrArray& aArray, CAiwCriteriaItem* aItem)
 {
-_AKNTRACE_FUNC_ENTER;
 if (aItem->MaxProviders() <= 0)
 {
 aArray.ResetAndDestroy();
 }
 else
 delete aArray[0];
 aArray.Remove(0);
 }
 }
 }
-_AKNTRACE_FUNC_EXIT;
 }
 TBool CAiwServiceHandlerImpl::IsCached(CAiwServiceIfBase* /*aProvider*/)
 TBool CAiwServiceHandlerImpl::IsInLastInitialized(CAiwMenuPane* aiwPane) const
 {
-_AKNTRACE_FUNC_ENTER;
 if (aiwPane)
 {
 if (iSubmenu == aiwPane)
 {
 return ETrue;
 return ETrue;
 }
 }
 }
-_AKNTRACE_FUNC_EXIT;
 return EFalse;
 }
 TInt CAiwServiceHandlerImpl::HandleNotifyL(
 CAiwMenuPane* CAiwServiceHandlerImpl::CreateEmptyAiwMenuPaneL(TInt aBaseMenuCmdId,
 TInt aResourceId)
 {
-_AKNTRACE_FUNC_ENTER;
 CAiwMenuPane* result = NULL;
 TResourceReader reader;
 TInt id;
 if(aResourceId >= 0)
 CleanupStack::Pop(pane);
 CleanupStack::PopAndDestroy(); // reader
 result->SetResourceSlotId( id );
-_AKNTRACE_FUNC_EXIT;
 return result;
 }
 void CAiwServiceHandlerImpl::DeleteAiwMenuPane(CAiwMenuPane* aAiwPane)
 {
-_AKNTRACE_FUNC_ENTER;
 delete aAiwPane->iMenuPane;
 aAiwPane->iMenuPane = NULL;
 // Reset iIdMap and extraText.
 for(TInt i = 0; i < aAiwPane->iIdMap.Count(); i++)
 }
 }
 delete aAiwPane;
 aAiwPane = NULL;
-_AKNTRACE_FUNC_EXIT;
 }
 const TInt resourceSlotIds[KMaxMenuResources] =
 {
 R_AIW_EMPTY_MENU_0,
 };
 TInt CAiwServiceHandlerImpl::ResourceIdForNextFreeSlot()
 {
-_AKNTRACE_FUNC_ENTER;
 if (iNextFreeSlot < KMaxMenuResources)
 {
 return resourceSlotIds[iNextFreeSlot++];
 }
-_AKNTRACE_FUNC_EXIT;
 return -1;
 }
 void CAiwServiceHandlerImpl::SetEmphasis(CCoeControl* /*aMenuControl*/,TBool /*aEmphasis*/)
 }
 void Cleanup( TAny* aAny )
 {
-_AKNTRACE_FUNC_ENTER;
 RImplInfoPtrArray* implArray =
 reinterpret_cast< RImplInfoPtrArray*> ( aAny );
 implArray->ResetAndDestroy();
 implArray->Close();
-_AKNTRACE_FUNC_EXIT;
 }
 void InterestCleanup( TAny* aAny )
 {
-_AKNTRACE_FUNC_ENTER;
 RPointerArray<CAiwCriteriaItem>* interestArray =
 reinterpret_cast<RPointerArray<CAiwCriteriaItem>*> ( aAny );
 interestArray->ResetAndDestroy();
-_AKNTRACE_FUNC_EXIT;
 }
 void FilteredCleanup( TAny* aAny )
 {
-_AKNTRACE_FUNC_ENTER;
 RPointerArray<CAiwCriteriaItem>* filteredArray =
 reinterpret_cast<RPointerArray<CAiwCriteriaItem>*> ( aAny );
 filteredArray->Reset();
-_AKNTRACE_FUNC_EXIT;
 }
 void IntArrayCleanup(TAny* aAny)
 {
-_AKNTRACE_FUNC_ENTER;
 RArray<TInt>* intArray =
 reinterpret_cast<RArray<TInt>*> ( aAny );
 intArray->Close();
-_AKNTRACE_FUNC_EXIT;
 }
 void CAiwServiceHandlerImpl::CopyMenuItemsL(CAiwMenuPane* aSource, CEikMenuPane& aDest,
 TInt aStartIndex, TBool aIsSubmenu, TBool aSetAsItemSpecific)
 {
-_AKNTRACE_FUNC_ENTER;
 TInt cmdId;
 TInt inPos = aStartIndex;
 for (TInt i = 0; i < aSource->MenuPane().NumberOfItemsInPane(); i++)
 {
 }
 aDest.InsertMenuItemL(itemData, inPos++);
 }
 }
-_AKNTRACE_FUNC_EXIT;
 }
 TInt CAiwServiceHandlerImpl::SlotItemCmd(CEikMenuPane& aPane)
 {
-_AKNTRACE_FUNC_ENTER;
 TInt index;
 for (TInt i = 0; i < KMaxMenuResources; i++)
 {
 if (aPane.MenuItemExists(EAiwMenuSlotBase + i, index))
 {
 return EAiwMenuSlotBase + i;
 }
 }
-_AKNTRACE_FUNC_EXIT;
 return -1;
 }
 CAiwMenuPane* CAiwServiceHandlerImpl::MenuPaneForSlotCmd(TInt aCmdId)
 {
-_AKNTRACE_FUNC_ENTER;
 TInt index = aCmdId - EAiwMenuSlotBase;
 if (index < KMaxMenuResources)
 {
 TInt resId = resourceSlotIds[index];
 return iMenuPanes[i];
 }
 }
 }
-_AKNTRACE_FUNC_EXIT;
 return NULL;
 }
 CAiwServiceHandlerImpl::TAiwPlaceholderType CAiwServiceHandlerImpl::PlaceholderType(
 CEikMenuPane& aPane, TInt aCmd, TBool& aTitleLocked)
 {
-_AKNTRACE_FUNC_ENTER;
 CEikMenuPaneItem::SData& itemData = aPane.ItemData(aCmd);
-_AKNTRACE("itemData.iCascadeId:%x",itemData.iCascadeId);
 aTitleLocked = EFalse;
 if ((itemData.iCascadeId & AIW_CASCADE_ID) == AIW_CASCADE_ID)
 {
 if (itemData.iCascadeId & AIW_LOCK_SUBMENU_TITLE)
 aTitleLocked = ETrue;
 }
 return EAiwPlaceholderIntelligentCascade;
 }
-_AKNTRACE_FUNC_EXIT;
 return EAiwPlaceholderNormal;
 }
 void CAiwServiceHandlerImpl::ConvertPlaceholderL(CEikMenuPane& aPane, TInt aCmd,
 CAiwMenuPane& aAiwPane, const TDesC& aTitle, TBool aSetAsItemSpecific)
 {
-_AKNTRACE_FUNC_ENTER;
 CEikMenuPaneItem::SData itemData = aPane.ItemData(aCmd);
 TInt index;
 // Remenber index.
 aPane.MenuItemExists(aCmd, index);
 itemData.iFlags |= EEikMenuItemSpecific;
 }
 // Insert cascade item.
 aPane.InsertMenuItemL(itemData, index);
-_AKNTRACE_FUNC_EXIT;
 }
 void CAiwServiceHandlerImpl::UnCascadeL(CEikMenuPane& aPane, TInt aCmd,
 CAiwMenuPane& aAiwPane, TBool aSetAsItemSpecific)
 {
-_AKNTRACE_FUNC_ENTER;
 CEikMenuPaneItem::SData itemData = aAiwPane.MenuPane().ItemData(aAiwPane.FindCmdId(0));
 TInt index;
 // Remenber index.
 aPane.MenuItemExists(aCmd, index);
 itemData.iFlags |= EEikMenuItemSpecific;
 }
 // Insert cascade item.
 aPane.InsertMenuItemL(itemData, index);
-_AKNTRACE_FUNC_EXIT;
 }
 void CAiwServiceHandlerImpl::SkipMenuFields(TResourceReader& aReader)
 {
-_AKNTRACE_FUNC_ENTER;
 aReader.ReadInt32(); // Skip cascade id
 aReader.ReadInt32(); // Skip flags
 aReader.ReadTPtrC(); // Skip text
 aReader.ReadTPtrC(); // Skip extra text
 aReader.ReadTPtrC(); // Skip bmpfile.
 aReader.ReadInt16(); // Skip bmpid.
 aReader.ReadInt16(); // Skip bmpmask.
 aReader.ReadInt32(); // Skip extension.
-_AKNTRACE_FUNC_EXIT;
 }
 TBool CAiwServiceHandlerImpl::IsAiwMenu(TInt aMenuResourceId)
 {
-_AKNTRACE_FUNC_ENTER;
 TInt i;
 // First check if this is aiw submenu id
 for (i = 0; i < KMaxMenuResources; i++)
 {
 {
 return ETrue;
 }
 }
-_AKNTRACE_FUNC_EXIT;
 return EFalse;
 }
 TBool CAiwServiceHandlerImpl::HandleSubmenuL(CEikMenuPane& aPane)
 {
-_AKNTRACE_FUNC_ENTER;
 TInt slotcmd = SlotItemCmd(aPane);
 if (slotcmd >= 0)
 {
 // aPane is aiw submenu. At this point it is empty and we must
 // copy provider menu items to it.
 iSubmenu = aiwPane;
 return ETrue;
 }
 }
-_AKNTRACE_FUNC_EXIT;
 return EFalse;
 }
 TBool CAiwServiceHandlerImpl::GetSubmenuTitle(CEikMenuPane& aPane, TDes& aResult)
 {
-_AKNTRACE_FUNC_ENTER;
 TInt index;
 aResult.Zero();
 while (aPane.MenuItemExists(AIW_SUBMENU_TITLE, index))
 {
 aResult.Copy(itemData.iText);
 }
 aPane.DeleteMenuItem(AIW_SUBMENU_TITLE);
 return ETrue;
 }
-_AKNTRACE_FUNC_EXIT;
 return EFalse;
 }
 void CAiwServiceHandlerImpl::FilterInterestListL(RPointerArray<CAiwCriteriaItem>& aOriginal,
 RPointerArray<CAiwCriteriaItem>& aFiltered)
 {
-_AKNTRACE_FUNC_ENTER;
 CAiwCriteriaItem* item;
 while (aOriginal.Count() > 0)
 {
 item = aOriginal[0];
 aOriginal.Remove(0);
 item = ConvertCriteriaItemPointerL(item);
 User::LeaveIfError(aFiltered.Append(item));
 }
 aOriginal.Reset();
-_AKNTRACE_FUNC_EXIT;
 }
 void CAiwServiceHandlerImpl::RemoveProvider(TInt aImplUid)
 {
-_AKNTRACE_FUNC_ENTER;
 TInt i;
 // First go through bindings and remove all the
 // references to given provider.
 for (i = 0; i < iBaseBindings.Count(); i++)
 delete iProviders[i];
 iProviders.Remove(i);
 i--;
 }
 }
-_AKNTRACE_FUNC_EXIT;
 }
 void CAiwServiceHandlerImpl::AddProviderL(TUid aImplUid, CAiwCriteriaItem* aItem)
 {
-_AKNTRACE_FUNC_ENTER;
-_AKNTRACE("aImplUid:%x",aImplUid.iUid);
 TInt i;
 CAiwServiceIfBase* iface = iEcomMonitor->CreateImplementationL(aImplUid);
 if (iface)
 {
 iMenuBindings[i]->AddProviderL(iface, aImplUid == aItem->DefaultProvider());
 iface->InitialiseL(*this, iMenuBindings[i]->Interest());
 }
 }
 }
-_AKNTRACE_FUNC_EXIT;
 }
 TInt CAiwServiceHandlerImpl::SynchronizeCallBack(TAny* aImpl)
 {
-_AKNTRACE_FUNC_ENTER;
-_AKNTRACE("aImpl:%x",aImpl);
 CAiwServiceHandlerImpl* impl = reinterpret_cast<CAiwServiceHandlerImpl*>(aImpl);
 TRAPD(err, impl->SynchronizeDbL());
-_AKNTRACE_FUNC_EXIT;
 return err;
 }
 void CAiwServiceHandlerImpl::SynchronizeDbL()
 {
-_AKNTRACE_FUNC_ENTER;
 TInt i;
 RArray<TInt> providers;
 RImplInfoPtrArray infoArray;
 CleanupStack::PushL( TCleanupItem( IntArrayCleanup, &providers ) );
 HandleRemovedProviders(providers, infoArray);
 HandleNewProvidersL(providers, infoArray, iInterestList[i]);
 }
 CleanupStack::PopAndDestroy(2); // providers, infoArray
-_AKNTRACE_FUNC_EXIT;
 }
 void CAiwServiceHandlerImpl::HandleRemovedProviders(RArray<TInt>& aInMemory,
 RImplInfoPtrArray& aInSystem)
 {
-_AKNTRACE_FUNC_ENTER;
 TInt i, j;
 for (i = 0; i < aInMemory.Count(); i++)
 {
 for (j = 0; j < aInSystem.Count(); j++)
 if (j >= aInSystem.Count())  // Was removed from system.
 {
 RemoveProvider(aInMemory[i]);
 }
 }
-_AKNTRACE_FUNC_EXIT;
 }
 void CAiwServiceHandlerImpl::HandleNewProvidersL(RArray<TInt>& aInMemory,
 RImplInfoPtrArray& aInSystem, CAiwCriteriaItem* aItem)
 {
-_AKNTRACE_FUNC_ENTER;
 TInt i;
 for (i = 0; i < aInSystem.Count(); i++)
 {
 if (aInMemory.Find(aInSystem[i]->ImplementationUid().iUid) == KErrNotFound)
 {
 AddProviderL(aInSystem[i]->ImplementationUid(), aItem);
 }
 }
-_AKNTRACE_FUNC_EXIT;
 }
 void CAiwServiceHandlerImpl::MenuLaunched()
 {
-_AKNTRACE_FUNC_ENTER;
 ClearMenuPaneArray();
 iNextFreeSlot = 0;
 iLastInitialized.Reset();
 // Reset the iMenuPane pointers from iMenuBindings.
 for(TInt i = 0; i < iMenuBindings.Count(); i++)
 {
 iMenuBindings[i]->SetMenuPane(NULL);
 }
-_AKNTRACE_FUNC_EXIT;
 }
 // End of file

branch	RCL_3
changeset 55	aecbbf00d063
parent 51	fcdfafb36fe7
child 56	d48ab3b357f1