--- a/predictivesearch/PcsServerClientAPI/src/CPsRequestHandler.cpp	Mon Mar 15 12:39:26 2010 +0200
+++ b/predictivesearch/PcsServerClientAPI/src/CPsRequestHandler.cpp	Wed Mar 31 21:13:53 2010 +0300
@@ -537,7 +537,7 @@
     PRINT1 ( _L("CPSRequestHandler::HandleSearchResultsL: Number of search results received = %d"), count );
 
     // Internalize each data element
-    for (int i = 0; i < count; i++)
+    for (TInt i = 0; i < count; i++)
         {
         CPsClientData* data = CPsClientData::NewL();
         CleanupStack::PushL(data);
@@ -575,7 +575,7 @@
     PRINT1 ( _L("CPSRequestHandler::HandleSearchResultsL: Number of match sequences received = %d"), seqCount );
 
     // Internalize each char seq
-    for (int i = 0; i < seqCount; i++)
+    for (TInt i = 0; i < seqCount; i++)
         {
         CPsPattern* pattern = CPsPattern::NewL();
         CleanupStack::PushL(pattern);
@@ -590,36 +590,21 @@
         searchSeqs.Append(pattern);
         }
 
-    CleanupStack::PopAndDestroy(); // stream
+    CleanupStack::PopAndDestroy( &stream );
 
     // Pass the results to the observer
-    for (int i = 0; i < iObservers.Count(); i++)
+    for (TInt i = 0; i < iObservers.Count(); i++)
         {
         iObservers[i]->HandlePsResultsUpdate(searchResults, searchSeqs);
         }
 
     // Clear all the internal buffers
-    if (iSearchQueryBuffer)
-        {
-        delete iSearchQueryBuffer;
-        iSearchQueryBuffer = NULL;
-        }
-
-    if (searchResults.Count())
-        {
-        searchResults.ResetAndDestroy();
-        }
-
-    if (searchSeqs.Count())
-        {
-        searchSeqs.ResetAndDestroy();
-        }
-
-    if (iSearchResultsBuffer)
-        {
-        delete iSearchResultsBuffer;
-        iSearchResultsBuffer = NULL;
-        }
+    searchResults.ResetAndDestroy();
+    searchSeqs.ResetAndDestroy();
+    delete iSearchQueryBuffer;
+    iSearchQueryBuffer = NULL;
+    delete iSearchResultsBuffer;
+    iSearchResultsBuffer = NULL;
 
     PRINT ( _L("End CPSRequestHandler::HandleSearchResultsL") );