--- a/applicationinterworkingfw/ServiceHandler/src/AiwServiceHandlerImpl.cpp Wed Sep 15 12:29:17 2010 +0300
+++ b/applicationinterworkingfw/ServiceHandler/src/AiwServiceHandlerImpl.cpp Wed Oct 13 14:50:15 2010 +0300
@@ -31,7 +31,6 @@
#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.
@@ -67,14 +66,10 @@
CAiwServiceHandlerImpl* CAiwServiceHandlerImpl::NewL()
{
- _AKNTRACE_FUNC_ENTER;
-
CAiwServiceHandlerImpl* handler = new (ELeave) CAiwServiceHandlerImpl();
CleanupStack::PushL( handler );
handler->ConstructL();
CleanupStack::Pop(); // handler
-
- _AKNTRACE_FUNC_EXIT;
return handler;
}
@@ -124,8 +119,6 @@
CAiwServiceHandlerImpl::~CAiwServiceHandlerImpl()
{
- _AKNTRACE_FUNC_ENTER;
-
if (iResourceOffset && iCoeEnv)
{
iCoeEnv->DeleteResourceFile(iResourceOffset);
@@ -140,18 +133,12 @@
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();
@@ -165,8 +152,6 @@
iInParams = NULL;
delete iOutParams;
iOutParams = NULL;
-
- _AKNTRACE_FUNC_EXIT;
}
@@ -174,8 +159,6 @@
void CAiwServiceHandlerImpl::ListProvidersForCriteriaL(RArray<TInt>& aResult,
CAiwCriteriaItem& aItem)
{
- _AKNTRACE_FUNC_ENTER;
-
TInt i;
for (i = 0; i < iProviders.Count(); i++)
@@ -185,16 +168,12 @@
User::LeaveIfError(aResult.Append(iProviders[i]->ImplementationUid().iUid));
}
}
-
- _AKNTRACE_FUNC_EXIT;
}
TInt CAiwServiceHandlerImpl::NbrOfProviders(const CAiwCriteriaItem* aCriteria)
{
- _AKNTRACE_FUNC_ENTER;
-
if(!aCriteria)
{
return 0;
@@ -224,7 +203,6 @@
}
}
- _AKNTRACE_FUNC_EXIT;
return 0;
}
@@ -232,8 +210,6 @@
void CAiwServiceHandlerImpl::AttachL(TInt aInterestResourceId)
{
- _AKNTRACE_FUNC_ENTER;
- _AKNTRACE("aInterestResourceId:%x",aInterestResourceId);
// CCoeEnv/CEikonEnv needs to be accessible.
if(!iCoeEnv)
{
@@ -258,16 +234,12 @@
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 ) );
@@ -285,12 +257,6 @@
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);
}
@@ -303,18 +269,12 @@
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++)
{
@@ -345,15 +305,11 @@
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)
@@ -361,16 +317,12 @@
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++)
{
@@ -399,18 +351,13 @@
RemoveObsoleteCriteriaItems();
// Finally check if there were left obselete providers and remove them.
- RemoveObsoleteProviders();
-
- _AKNTRACE_FUNC_EXIT;
+ RemoveObsoleteProviders();
}
void CAiwServiceHandlerImpl::DetachL(TInt aInterestResourceId)
{
- _AKNTRACE_FUNC_ENTER;
- _AKNTRACE("aInterestResourceId:%x",aInterestResourceId);
-
// CCoeEnv/CEikonEnv needs to be accessible.
if(!iCoeEnv)
{
@@ -430,14 +377,11 @@
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)
@@ -445,15 +389,12 @@
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;
@@ -485,8 +426,6 @@
ret++;
}
}
-
- _AKNTRACE_FUNC_EXIT;
return ret;
}
@@ -496,12 +435,8 @@
TInt aBaseMenuCmdId,
const CAiwGenericParamList& aInParamList)
{
- _AKNTRACE_FUNC_ENTER;
-
InitializeMenuPaneL(aMenuPane, aMenuResourceId, aBaseMenuCmdId,
aInParamList, EFalse, EFalse);
-
- _AKNTRACE_FUNC_EXIT;
}
void CAiwServiceHandlerImpl::InitializeMenuPaneL(
@@ -511,11 +446,7 @@
const CAiwGenericParamList& aInParamList,
TBool aUseSubmenuTextsIfAvailable)
{
- _AKNTRACE_FUNC_ENTER;
-
InitializeMenuPaneL(aMenuPane, aMenuResourceId, aBaseMenuCmdId, aInParamList, aUseSubmenuTextsIfAvailable, EFalse);
-
- _AKNTRACE_FUNC_EXIT;
}
@@ -527,20 +458,6 @@
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)
{
@@ -675,16 +592,11 @@
}
}
}
-
- _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())) &&
@@ -694,8 +606,6 @@
}
}
- _AKNTRACE_FUNC_EXIT;
-
return 0;
}
@@ -708,27 +618,6 @@
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)
{
@@ -764,17 +653,12 @@
}
}
}
- _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)
{
@@ -797,17 +681,12 @@
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)
{
@@ -828,16 +707,11 @@
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)
{
@@ -862,12 +736,6 @@
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);
}
@@ -880,19 +748,12 @@
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;
@@ -972,8 +833,6 @@
}
SkipMenuFields(aReader); // Jump to next menu item
}
-
- _AKNTRACE_FUNC_EXIT;
}
@@ -990,10 +849,6 @@
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)
{
@@ -1019,16 +874,11 @@
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++)
{
@@ -1045,16 +895,11 @@
// 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++)
{
@@ -1086,16 +931,12 @@
RemoveObsoleteCriteriaItems();
// Finally check if there were left obselete providers and remove them.
- RemoveObsoleteProviders();
-
- _AKNTRACE_FUNC_EXIT;
+ RemoveObsoleteProviders();
}
void CAiwServiceHandlerImpl::RemoveObsoleteCriteriaItems()
{
- _AKNTRACE_FUNC_ENTER;
-
for (TInt i = 0; i < iInterestList.Count(); i++)
{
CAiwCriteriaItem* criteria = iInterestList[i];
@@ -1132,15 +973,11 @@
i--;
}
}
-
- _AKNTRACE_FUNC_EXIT;
}
void CAiwServiceHandlerImpl::RemoveObsoleteProviders()
{
- _AKNTRACE_FUNC_ENTER;
-
for (TInt i = 0; i < iProviders.Count(); i++)
{
CAiwServiceIfBase* provider = iProviders[i];
@@ -1177,33 +1014,24 @@
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;
}
@@ -1213,21 +1041,16 @@
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;
}
@@ -1239,21 +1062,6 @@
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))
@@ -1269,8 +1077,6 @@
}
}
}
-
- _AKNTRACE_FUNC_EXIT;
}
@@ -1278,8 +1084,6 @@
void CAiwServiceHandlerImpl::ReadInterestListL(TResourceReader& aReader,
RPointerArray<CAiwCriteriaItem>& aResult)
{
- _AKNTRACE_FUNC_ENTER;
-
const TInt count = aReader.ReadInt16();
for (TInt ii = 0; ii < count; ++ii)
{
@@ -1288,15 +1092,11 @@
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;
@@ -1357,8 +1157,6 @@
CleanupStack::PopAndDestroy(); // infoArray
- _AKNTRACE_FUNC_EXIT;
-
return result;
}
@@ -1366,8 +1164,6 @@
void CAiwServiceHandlerImpl::FilterInfoArray(RImplInfoPtrArray& aArray, CAiwCriteriaItem* aItem)
{
- _AKNTRACE_FUNC_ENTER;
-
if (aItem->MaxProviders() <= 0)
{
aArray.ResetAndDestroy();
@@ -1389,8 +1185,6 @@
}
}
}
-
- _AKNTRACE_FUNC_EXIT;
}
@@ -1427,7 +1221,6 @@
TBool CAiwServiceHandlerImpl::IsInLastInitialized(CAiwMenuPane* aiwPane) const
{
- _AKNTRACE_FUNC_ENTER;
if (aiwPane)
{
if (iSubmenu == aiwPane)
@@ -1444,7 +1237,6 @@
}
}
- _AKNTRACE_FUNC_EXIT;
return EFalse;
}
@@ -1477,8 +1269,6 @@
CAiwMenuPane* CAiwServiceHandlerImpl::CreateEmptyAiwMenuPaneL(TInt aBaseMenuCmdId,
TInt aResourceId)
{
- _AKNTRACE_FUNC_ENTER;
-
CAiwMenuPane* result = NULL;
TResourceReader reader;
@@ -1511,16 +1301,12 @@
result->SetResourceSlotId( id );
- _AKNTRACE_FUNC_EXIT;
-
return result;
}
void CAiwServiceHandlerImpl::DeleteAiwMenuPane(CAiwMenuPane* aAiwPane)
{
- _AKNTRACE_FUNC_ENTER;
-
delete aAiwPane->iMenuPane;
aAiwPane->iMenuPane = NULL;
@@ -1553,8 +1339,6 @@
delete aAiwPane;
aAiwPane = NULL;
-
- _AKNTRACE_FUNC_EXIT;
}
const TInt resourceSlotIds[KMaxMenuResources] =
@@ -1580,14 +1364,11 @@
TInt CAiwServiceHandlerImpl::ResourceIdForNextFreeSlot()
{
- _AKNTRACE_FUNC_ENTER;
-
if (iNextFreeSlot < KMaxMenuResources)
{
return resourceSlotIds[iNextFreeSlot++];
}
- _AKNTRACE_FUNC_EXIT;
return -1;
}
@@ -1604,60 +1385,42 @@
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;
+ interestArray->ResetAndDestroy();
}
void FilteredCleanup( TAny* aAny )
{
- _AKNTRACE_FUNC_ENTER;
-
RPointerArray<CAiwCriteriaItem>* filteredArray =
reinterpret_cast<RPointerArray<CAiwCriteriaItem>*> ( aAny );
- filteredArray->Reset();
-
- _AKNTRACE_FUNC_EXIT;
+ filteredArray->Reset();
}
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;
@@ -1688,16 +1451,12 @@
aDest.InsertMenuItemL(itemData, inPos++);
}
}
-
- _AKNTRACE_FUNC_EXIT;
}
TInt CAiwServiceHandlerImpl::SlotItemCmd(CEikMenuPane& aPane)
{
- _AKNTRACE_FUNC_ENTER;
-
TInt index;
for (TInt i = 0; i < KMaxMenuResources; i++)
@@ -1708,7 +1467,6 @@
}
}
- _AKNTRACE_FUNC_EXIT;
return -1;
}
@@ -1716,8 +1474,6 @@
CAiwMenuPane* CAiwServiceHandlerImpl::MenuPaneForSlotCmd(TInt aCmdId)
{
- _AKNTRACE_FUNC_ENTER;
-
TInt index = aCmdId - EAiwMenuSlotBase;
if (index < KMaxMenuResources)
@@ -1732,8 +1488,6 @@
}
}
- _AKNTRACE_FUNC_EXIT;
-
return NULL;
}
@@ -1742,11 +1496,8 @@
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)
@@ -1766,7 +1517,6 @@
return EAiwPlaceholderIntelligentCascade;
}
- _AKNTRACE_FUNC_EXIT;
return EAiwPlaceholderNormal;
}
@@ -1774,8 +1524,6 @@
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;
@@ -1803,16 +1551,12 @@
// 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;
@@ -1832,16 +1576,12 @@
// 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
@@ -1850,15 +1590,11 @@
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
@@ -1879,8 +1615,6 @@
}
}
- _AKNTRACE_FUNC_EXIT;
-
return EFalse;
}
@@ -1888,7 +1622,6 @@
TBool CAiwServiceHandlerImpl::HandleSubmenuL(CEikMenuPane& aPane)
{
- _AKNTRACE_FUNC_ENTER;
TInt slotcmd = SlotItemCmd(aPane);
if (slotcmd >= 0)
{
@@ -1904,7 +1637,6 @@
}
}
- _AKNTRACE_FUNC_EXIT;
return EFalse;
}
@@ -1912,8 +1644,6 @@
TBool CAiwServiceHandlerImpl::GetSubmenuTitle(CEikMenuPane& aPane, TDes& aResult)
{
- _AKNTRACE_FUNC_ENTER;
-
TInt index;
aResult.Zero();
@@ -1927,8 +1657,7 @@
aPane.DeleteMenuItem(AIW_SUBMENU_TITLE);
return ETrue;
}
-
- _AKNTRACE_FUNC_EXIT;
+
return EFalse;
}
@@ -1958,8 +1687,6 @@
void CAiwServiceHandlerImpl::FilterInterestListL(RPointerArray<CAiwCriteriaItem>& aOriginal,
RPointerArray<CAiwCriteriaItem>& aFiltered)
{
- _AKNTRACE_FUNC_ENTER;
-
CAiwCriteriaItem* item;
while (aOriginal.Count() > 0)
@@ -1970,16 +1697,12 @@
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
@@ -2004,16 +1727,11 @@
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);
@@ -2042,22 +1760,14 @@
}
}
}
-
- _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;
}
@@ -2065,8 +1775,6 @@
void CAiwServiceHandlerImpl::SynchronizeDbL()
{
- _AKNTRACE_FUNC_ENTER;
-
TInt i;
RArray<TInt> providers;
RImplInfoPtrArray infoArray;
@@ -2090,16 +1798,12 @@
}
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++)
@@ -2116,16 +1820,12 @@
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++)
@@ -2135,14 +1835,10 @@
AddProviderL(aInSystem[i]->ImplementationUid(), aItem);
}
}
-
- _AKNTRACE_FUNC_EXIT;
}
void CAiwServiceHandlerImpl::MenuLaunched()
{
- _AKNTRACE_FUNC_ENTER;
-
ClearMenuPaneArray();
iNextFreeSlot = 0;
iLastInitialized.Reset();
@@ -2152,8 +1848,6 @@
{
iMenuBindings[i]->SetMenuPane(NULL);
}
-
- _AKNTRACE_FUNC_EXIT;
}
// End of file