diff -r ccd0fd43f247 -r 208a4ba3894c searchui/indevicehandler/src/indevicehandler.cpp --- a/searchui/indevicehandler/src/indevicehandler.cpp Mon Apr 19 14:40:05 2010 +0300 +++ b/searchui/indevicehandler/src/indevicehandler.cpp Mon May 03 12:32:15 2010 +0300 @@ -27,6 +27,19 @@ { } // --------------------------------------------------------------------------- +// InDeviceHandler::~InDeviceHandler() +// --------------------------------------------------------------------------- +// +InDeviceHandler::~InDeviceHandler() + { + if (mSearchInterface) + { + delete mSearchInterface; + + } + } + +// --------------------------------------------------------------------------- // InDeviceHandler::getSearchResult(int aError, int estimatedResultCount) // aError: error code // estimatedResultCount: number of hits @@ -71,45 +84,8 @@ } return doc; } -// --------------------------------------------------------------------------- -// InDeviceHandler:: search(QString aSearchString) -// aSearchString: string to be searched sync -// --------------------------------------------------------------------------- -// -void InDeviceHandler::search(QString aSearchString) - { - qDebug() << "InDeviceHandler::search Enter"; - if (aSearchString.length()) - { - int error = 0; - mSearchResultCount = 0; - if (mSearchInterface) - { - try - { - mSearchResultCount = mSearchInterface->search(aSearchString); - } - catch (...) - { - error = -1; - } - } - emit handleSearchResult(error, mSearchResultCount); - } - qDebug() << "InDeviceHandler::search Exit"; - } -// --------------------------------------------------------------------------- -// InDeviceHandler::~InDeviceHandler() -// --------------------------------------------------------------------------- -// -InDeviceHandler::~InDeviceHandler() - { - if (mSearchInterface) - { - delete mSearchInterface; - } - } + // --------------------------------------------------------------------------- // InDeviceHandler::getSearchResultCount() // gets the number of hits @@ -141,7 +117,7 @@ } // --------------------------------------------------------------------------- -// InDeviceHandler::searchAsync(QString aSearchAsyncString, QString/* aDefaultSearchField*/) +// InDeviceHandler::searchAsync // aSearchAsyncString: string to be searched // async // --------------------------------------------------------------------------- @@ -186,7 +162,7 @@ } } // --------------------------------------------------------------------------- -// InDeviceHandler::setCategory(QString astring) +// InDeviceHandler::setCategory // astring: setting categories to be searched // --------------------------------------------------------------------------- // @@ -203,6 +179,14 @@ database.append(astring); mSearchInterface = QCPixSearcher::newInstance(database, DEFAULT_SEARCH_FIELD); + } + else + { + mSearchInterface = QCPixSearcher::newInstance("root", + DEFAULT_SEARCH_FIELD); + } + if (mSearchInterface) + { try { mSearchInterface->connect(mSearchInterface, @@ -226,6 +210,7 @@ } } } + // --------------------------------------------------------------------------- // InDeviceHandler::isPrepared() // verify the mSearchInterface is prepared or not