equal
deleted
inserted
replaced
56 CLbtTriggerEntry* trigEntry=aEntry->TriggerEntry(); |
56 CLbtTriggerEntry* trigEntry=aEntry->TriggerEntry(); |
57 CLbtExtendedTriggerInfo* contExtInfo=aEntry->ExtendedTriggerInfo(); |
57 CLbtExtendedTriggerInfo* contExtInfo=aEntry->ExtendedTriggerInfo(); |
58 TInt i=0; |
58 TInt i=0; |
59 if(trigEntry!=NULL) |
59 if(trigEntry!=NULL) |
60 { |
60 { |
61 if((isFilterPresent>0 && isEntryRequested) || (iTriggerStateArray.Count()>0 && isFilterPresent==0)) |
61 if( iTriggerStateArray.Count()>0 ) |
62 { |
62 { |
63 isFilterPresent++; |
63 isFilterPresent++; |
64 for(i=0;i<iTriggerStateArray.Count();i++) |
64 for(i=0;i<iTriggerStateArray.Count();i++) |
65 { |
65 { |
66 if(trigEntry->State()==iTriggerStateArray[i]) |
66 if(trigEntry->State()==iTriggerStateArray[i]) |
68 isEntryRequested=ETrue; |
68 isEntryRequested=ETrue; |
69 break; |
69 break; |
70 } |
70 } |
71 } |
71 } |
72 } |
72 } |
73 if( (isFilterPresent>0 && isEntryRequested && iTriggerValidityArray.Count()>0) || |
73 if( (isFilterPresent>0 && isEntryRequested ) || |
74 (iTriggerValidityArray.Count()>0 && isFilterPresent==0) ) |
74 (isFilterPresent==0) ) |
75 { |
75 { |
|
76 if(iTriggerValidityArray.Count()>0) |
|
77 { |
76 isFilterPresent++; |
78 isFilterPresent++; |
77 isEntryRequested=EFalse; |
79 isEntryRequested=EFalse; |
78 for(i=0;i<iTriggerValidityArray.Count();i++) |
80 for(i=0;i<iTriggerValidityArray.Count();i++) |
79 { |
81 { |
80 if(aEntry->DynInfo()->iValidity == iTriggerValidityArray[i]) |
82 if(aEntry->DynInfo()->iValidity == iTriggerValidityArray[i]) |
81 { |
83 { |
82 isEntryRequested=ETrue; |
84 isEntryRequested=ETrue; |
83 } |
85 } |
84 } |
86 } |
85 } |
87 } |
|
88 } |
86 |
89 |
87 if((isFilterPresent>0 && isEntryRequested && iTriggerTypeArray.Count()>0) || (iTriggerTypeArray.Count()>0 && isFilterPresent==0)) |
90 if((isFilterPresent>0 && isEntryRequested && iTriggerTypeArray.Count()>0) || (iTriggerTypeArray.Count()>0 && isFilterPresent==0)) |
88 { |
91 { |
89 isFilterPresent++; |
92 isFilterPresent++; |
90 isEntryRequested=EFalse; |
93 isEntryRequested=EFalse; |