qtmobility/src/messaging/qmessagefilter_symbian.cpp
changeset 4 90517678cc4f
parent 1 2b40d63a9c3d
child 11 06b8e2af4411
--- a/qtmobility/src/messaging/qmessagefilter_symbian.cpp	Fri Apr 16 15:51:22 2010 +0300
+++ b/qtmobility/src/messaging/qmessagefilter_symbian.cpp	Mon May 03 13:18:40 2010 +0300
@@ -236,13 +236,13 @@
             QMessageDataComparator::EqualityComparator cmp(static_cast<QMessageDataComparator::EqualityComparator>(filter._comparatorValue));
             if (cmp == QMessageDataComparator::Equal) {
                 if (filter._value.toString().length() > 0) {
-                    if (message.from().recipient().compare(filter._value.toString(),caseSensitivity) == 0) {
+                    if (message.from().addressee().compare(filter._value.toString(),caseSensitivity) == 0) {
                         return true;
                     }
                 }
             } else { // NotEqual
                 if (filter._value.toString().length() > 0) {
-                    if (message.from().recipient().compare(filter._value.toString(),caseSensitivity) != 0) {
+                    if (message.from().addressee().compare(filter._value.toString(),caseSensitivity) != 0) {
                         return true;
                     }
                 } else {
@@ -252,11 +252,11 @@
         } else if (filter._comparatorType == QMessageFilterPrivate::Inclusion) {
             QMessageDataComparator::InclusionComparator cmp(static_cast<QMessageDataComparator::InclusionComparator>(filter._comparatorValue));
             if (cmp == QMessageDataComparator::Includes) {
-                if (message.from().recipient().contains(filter._value.toString(),caseSensitivity)) {
+                if (message.from().addressee().contains(filter._value.toString(),caseSensitivity)) {
                     return true;
                 }
             } else { // Excludes
-            if (!message.from().recipient().contains(filter._value.toString(),caseSensitivity)) {
+            if (!message.from().addressee().contains(filter._value.toString(),caseSensitivity)) {
                     return true;
                 }
             }
@@ -271,7 +271,7 @@
             // Check to addresses
             QMessageAddressList addrList = message.to();
             for (int i=0; i < addrList.count(); i++) {
-                if (addrList[i].recipient().contains(filter._value.toString(),caseSensitivity)) {
+                if (addrList[i].addressee().contains(filter._value.toString(),caseSensitivity)) {
                     includes = true;
                     break;
                 }
@@ -280,7 +280,7 @@
                 // Check cc addresses
                 addrList = message.cc();
                 for (int i=0; i < addrList.count(); i++) {
-                    if (addrList[i].recipient().contains(filter._value.toString(),caseSensitivity)) {
+                    if (addrList[i].addressee().contains(filter._value.toString(),caseSensitivity)) {
                         includes = true;
                         break;
                     }
@@ -290,7 +290,7 @@
                 // Check bcc addresses
                 addrList = message.bcc();
                 for (int i=0; i < addrList.count(); i++) {
-                    if (addrList[i].recipient().contains(filter._value.toString(),caseSensitivity)) {
+                    if (addrList[i].addressee().contains(filter._value.toString(),caseSensitivity)) {
                         includes = true;
                         break;
                     }