metadataengine/client/src/mdequery.cpp
branchRCL_3
changeset 63 e538444823de
parent 47 b73252188534
equal deleted inserted replaced
57:2872ae438bf7 63:e538444823de
    44     iDestroyed = ETrue;
    44     iDestroyed = ETrue;
    45 	Cancel();
    45 	Cancel();
    46   
    46   
    47     // This will destroy the entire conditions tree.
    47     // This will destroy the entire conditions tree.
    48    	delete iConditions;
    48    	delete iConditions;
    49    	iConditions = NULL;
    49 
    50    	
       
    51     // Destroy all result items this query instance owns.
    50     // Destroy all result items this query instance owns.
    52    	for( TInt i = iResults.Count() - 1; i >=0; i-- )
    51    	for( TInt i = iResults.Count() - 1; i >=0; i-- )
    53         {
    52         {
    54         if(iResults[i].iOwned)
    53         if(iResults[i].iOwned)
    55             {
    54             {
    56             delete iResults[i].iItem;
    55             delete iResults[i].iItem;
    57             iResults[i].iItem = NULL;
       
    58             }
    56             }
    59         }
    57         }
    60 
    58 
    61     // Destroy object result item this query instance owns  
    59     // Destroy object result item this query instance owns  
    62     if(iObjectResult.iItem)
    60     if(iObjectResult.iItem)
    77 
    75 
    78     iOrderRules.Close();
    76     iOrderRules.Close();
    79     iObservers.Close();
    77     iObservers.Close();
    80 
    78 
    81    	delete iDistinctResults;
    79    	delete iDistinctResults;
    82    	iDistinctResults = NULL;
       
    83 	}
    80 	}
    84 
    81 
    85 
    82 
    86 EXPORT_C TQueryType CMdEQuery::Type() const
    83 EXPORT_C TQueryType CMdEQuery::Type() const
    87     {
    84     {
   155     for( TInt i = iResults.Count() - 1; i >=0; i-- )
   152     for( TInt i = iResults.Count() - 1; i >=0; i-- )
   156         {
   153         {
   157         if(iResults[i].iOwned)
   154         if(iResults[i].iOwned)
   158             {
   155             {
   159             delete iResults[i].iItem;
   156             delete iResults[i].iItem;
   160             iResults[i].iItem = NULL;
       
   161             }
   157             }
   162         }
   158         }
   163 	iResults.Reset();
   159 	iResults.Reset();
   164 
   160 
   165     // Destroy object result item this query instance owns  
   161     // Destroy object result item this query instance owns