logsui/logscntfinder/src/logscntfinder.cpp
changeset 4 e52d42f9500c
parent 2 7119b73b84d6
child 6 41c0a814d878
--- a/logsui/logscntfinder/src/logscntfinder.cpp	Fri May 14 15:52:41 2010 +0300
+++ b/logsui/logscntfinder/src/logscntfinder.cpp	Thu May 27 12:51:53 2010 +0300
@@ -273,7 +273,7 @@
             LogsPredictiveTranslator::instance();
     
     mCurrentInputPattern = pattern;
-    mCurrentPredictivePattern = translator->translate( mCurrentInputPattern );
+    mCurrentPredictivePattern = translator->translatePattern( mCurrentInputPattern );
     
 }
 
@@ -300,18 +300,20 @@
         LOGS_QDEBUG_2( "logs [FINDER] caching from DB cid=", entry->contactId() )
         QContact contact = mContactManager->contact( entry->contactId() );
         QContactName contactName = contact.detail( QContactName::DefinitionName );
-        entry->setFirstName( contactName.value( QContactName::FieldFirst ) );
-        entry->setLastName( contactName.value( QContactName::FieldLast ) );
+        entry->setFirstName( contactName.value( QContactName::FieldFirstName ) );
+        entry->setLastName( contactName.value( QContactName::FieldLastName ) );
         QContactPhoneNumber contactPhoneNumber = 
               contact.detail( QContactPhoneNumber::DefinitionName );
         entry->setPhoneNumber( 
               contactPhoneNumber.value( QContactPhoneNumber::FieldNumber ) );
-        QContactAvatar contactAvatar = contact.detail<QContactAvatar>();  
-        if (contactAvatar.subType().compare(
-        QLatin1String(QContactAvatar::SubTypeImage)) == 0 && 
-               !contactAvatar.avatar().isEmpty()) {
-                  entry->setAvatarPath(contactAvatar.avatar());
-              } 
+        QContactAvatar contactAvatar = contact.detail<QContactAvatar>();
+        QString subType = contactAvatar.value( QContactAvatar::FieldSubType );
+        QString avatar = contactAvatar.value( QContactAvatar::FieldAvatar );
+        
+        if ( subType == QLatin1String( QContactAvatar::SubTypeImage ) &&
+             !avatar.isEmpty() ) {
+            entry->setAvatarPath( avatar );
+        }
         
         updateResult( entry );      
     }