diff -r 0a2ec6860a93 -r df6898e696c6 searchui/indevicehandler/src/indevicehandler.cpp
--- a/searchui/indevicehandler/src/indevicehandler.cpp	Mon Jul 12 00:27:06 2010 +0530
+++ b/searchui/indevicehandler/src/indevicehandler.cpp	Mon Jul 26 12:45:04 2010 +0530
@@ -15,8 +15,8 @@
  *
  */
 #include "indevicehandler.h"
-#include <qcpixsearcher.h>
-#include <qcpixdocument.h>
+#include <cpixsearcher.h>
+#include <cpixdocument.h>
 
 // ---------------------------------------------------------------------------
 // InDeviceHandler::InDeviceHandler()
@@ -52,12 +52,12 @@
     emit handleAsyncSearchResult(aError, estimatedResultCount);
     }
 // ---------------------------------------------------------------------------
-// InDeviceHandler::getDocumentAsync(int aError, QCPixDocument* aDocument)
+// InDeviceHandler::getDocumentAsync(int aError, CpixDocument* aDocument)
 // aError: error code
 // aDocument: holding the result item
 // ---------------------------------------------------------------------------
 //
-void InDeviceHandler::getDocumentAsync(int aError, QCPixDocument* aDocument)
+void InDeviceHandler::getDocumentAsync(int aError, CpixDocument* aDocument)
     {
     emit handleDocument(aError, aDocument);
     }
@@ -66,14 +66,14 @@
 // aIndex: item index to be found
 // ---------------------------------------------------------------------------
 //
-QCPixDocument* InDeviceHandler::getDocumentAtIndex(int aIndex)
+CpixDocument* InDeviceHandler::getDocumentAtIndex(int aIndex)
     {
-    QCPixDocument* doc = NULL;
+    CpixDocument* doc = NULL;
     if (mSearchInterface)
         {
         try
             {
-            doc = mSearchInterface->getDocument(aIndex);
+            doc = mSearchInterface->document(aIndex);
 
             }
         catch (...)
@@ -106,7 +106,7 @@
         {
         try
             {
-            mSearchInterface->getDocumentAsync(aIndex);
+            mSearchInterface->documentAsync(aIndex);
             }
         catch (...)
             {
@@ -177,12 +177,12 @@
         {
         QString database("root ");
         database.append(astring);
-        mSearchInterface = QCPixSearcher::newInstance(database,
+        mSearchInterface = CpixSearcher::newInstance(database,
                 DEFAULT_SEARCH_FIELD);
         }
     else
         {
-        mSearchInterface = QCPixSearcher::newInstance("root",
+        mSearchInterface = CpixSearcher::newInstance("root",
         DEFAULT_SEARCH_FIELD);
         }
     if (mSearchInterface)
@@ -201,8 +201,8 @@
         try
             {
             mSearchInterface->connect(mSearchInterface,
-                    SIGNAL(handleDocument(int,QCPixDocument*)), this,
-                    SLOT(getDocumentAsync(int,QCPixDocument*)));
+                    SIGNAL(handleDocument(int,CpixDocument*)), this,
+                    SLOT(getDocumentAsync(int,CpixDocument*)));
             }
         catch (...)
             {