logsui/logscntfinder/src/logscntfinder.cpp
changeset 16 c5af8598d22c
parent 14 f27aebe284bb
child 21 2f0af9ba7665
--- a/logsui/logscntfinder/src/logscntfinder.cpp	Wed Aug 18 09:49:12 2010 +0300
+++ b/logsui/logscntfinder/src/logscntfinder.cpp	Thu Sep 02 20:27:05 2010 +0300
@@ -20,6 +20,7 @@
 #include <qcontactname.h>
 #include <qcontactmanager.h>
 #include <qcontactavatar.h>
+#include <qcontactaction.h>
 
 #include "logscntentry.h"
 #include "logscntfinder.h"
@@ -175,7 +176,7 @@
 {
     LOGS_QDEBUG( "logs [FINDER] -> LogsCntFinder::doPredictiveContactQuery()" )
     QContactDetailFilter df;
-    df.setDetailDefinitionName( QContactName::DefinitionName );
+    df.setDetailDefinitionName( QContactName::DefinitionName, QContactName::FieldFirstName );
     df.setMatchFlags( QContactFilter::MatchKeypadCollation );
     df.setValue( mCurrentInputPattern );
     QList<QContactLocalId> cntIds;
@@ -285,11 +286,16 @@
     LOGS_QDEBUG( "logs [FINDER] -> LogsCntFinder::phoneNumber()" )
     QString number;
     if (mPreferDefaultNumber) {
-        number = contact.preferredDetail("call").value(
-                                    QContactPhoneNumber::FieldNumber );
-        if (number.isEmpty()) {
-            number = contact.detailWithAction("call").value(
-                                    QContactPhoneNumber::FieldNumber );
+            
+        QContactActionDescriptor callActionName("call");
+        
+        number = contact.preferredDetail( callActionName.actionName() ).value(
+                    QContactPhoneNumber::FieldNumber );
+        
+        if ( number.isEmpty() ) {
+            number = contact.detailWithAction( 
+                    QContactAction::action( callActionName ) ).value(
+                    QContactPhoneNumber::FieldNumber );
         }
     }