qtmobility/plugins/contacts/symbian/src/filtering/cntdisplaylabelsqlfilter.cpp
changeset 4 90517678cc4f
parent 1 2b40d63a9c3d
child 11 06b8e2af4411
--- a/qtmobility/plugins/contacts/symbian/src/filtering/cntdisplaylabelsqlfilter.cpp	Fri Apr 16 15:51:22 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/src/filtering/cntdisplaylabelsqlfilter.cpp	Mon May 03 13:18:40 2010 +0300
@@ -59,9 +59,9 @@
 
 void CntDisplayLabelSqlFilter::createSqlQuery(const QContactDetailFilter& filter,
                         QString& sqlQuery,
-                        QContactManager::Error& error)
+                        QContactManager::Error* error)
 {
-    error = QContactManager::NoError;
+    *error = QContactManager::NoError;
     
     //get the contact fields that should be checked
     CntDisplayLabel displayLabel;
@@ -98,15 +98,15 @@
         }
         
         if(!subQuery.isEmpty()){
-            sqlQuery += " AND (" + subQuery + ")";
+            sqlQuery += " AND (" + subQuery + ')';
         }
    
-        error = QContactManager::NoError;
+        *error = QContactManager::NoError;
     }
     
     //if specified more filter criterias than contact fields return error
     else if(searchStrings.count() > contactFields.count()){
-        error = QContactManager::BadArgumentError;
+        *error = QContactManager::BadArgumentError;
     }
 }
 
@@ -155,7 +155,7 @@
  */
 QString CntDisplayLabelSqlFilter::createSubQuery(const QString &searchValue, const QString &column) const
 {
-    return ("(" + column + " LIKE \'" + searchValue + "%\' OR " + column + " LIKE \'% " + searchValue + "%\')");
+    return ('(' + column + " LIKE \'" + searchValue + "%\' OR " + column + " LIKE \'% " + searchValue + "%\')");
 }
 
 /*
@@ -171,12 +171,12 @@
     //Name detail
     if(detail.first == QContactName::DefinitionName)
     {
-        if(detail.second == QContactName::FieldFirst)
+        if(detail.second == QContactName::FieldFirstName)
         {
             columnName = "first_name";
         }
         
-        else if(detail.second == QContactName::FieldLast)
+        else if(detail.second == QContactName::FieldLastName)
         {
             columnName = "last_name";
         }