diff -r afe194b6b1cd -r cf5c74390b98 qcpix/tsrc/samplesearch/searchhandler.cpp
--- a/qcpix/tsrc/samplesearch/searchhandler.cpp	Tue Jul 06 15:30:04 2010 +0300
+++ b/qcpix/tsrc/samplesearch/searchhandler.cpp	Wed Aug 18 10:53:26 2010 +0300
@@ -16,14 +16,14 @@
 */
 
 #include "searchhandler.h"
-#include <qcpixsearcher.h>
-#include <qcpixdocument.h>
+#include <cpixsearcher.h>
+#include <cpixdocument.h>
 
 CSearchHandler::CSearchHandler()
     {  
-    iSearchInterface = QCPixSearcher::newInstance("root","_aggregate");
+    iSearchInterface = CpixSearcher::newInstance("root","_aggregate");
     iSearchInterface->connect(iSearchInterface, SIGNAL(handleSearchResults(int,int)), this, SLOT(__handleSearchResult(int,int)));
-    iSearchInterface->connect(iSearchInterface, SIGNAL(handleDocument(int,QCPixDocument*)), this, SLOT(__getDocumentAsync(int,QCPixDocument*)));
+    iSearchInterface->connect(iSearchInterface, SIGNAL(handleDocument(int,CpixDocument*)), this, SLOT(__getDocumentAsync(int,CpixDocument*)));
     }
 
 void CSearchHandler::__handleSearchResult(int aError, int estimatedResultCount)
@@ -33,14 +33,14 @@
     emit handleAsyncSearchResult(aError, estimatedResultCount);
     }
 
-void CSearchHandler::__getDocumentAsync(int aError, QCPixDocument* aDocument )
+void CSearchHandler::__getDocumentAsync(int aError, CpixDocument* aDocument )
     {
     emit handleDocument( aError, aDocument );
     }
 
-QCPixDocument* CSearchHandler::getDocumentAtIndex(int aIndex)
+CpixDocument* CSearchHandler::getDocumentAtIndex(int aIndex)
     {
-    return iSearchInterface->getDocument( aIndex );
+    return iSearchInterface->document( aIndex );
     }
 
 void CSearchHandler::search(QString aSearchString)
@@ -63,7 +63,7 @@
 
 void CSearchHandler::getDocumentAsyncAtIndex( int aIndex )
     {
-    iSearchInterface->getDocumentAsync( aIndex );
+    iSearchInterface->documentAsync( aIndex );
     }
 
 void CSearchHandler::searchAsync(QString aSearchString)