equal
deleted
inserted
replaced
532 } |
532 } |
533 |
533 |
534 if (filter.d_ptr->_field == QMessageFilterPrivate::Recipients) { |
534 if (filter.d_ptr->_field == QMessageFilterPrivate::Recipients) { |
535 QMessageAddressList addresses(message.to() + message.cc() + message.bcc()); |
535 QMessageAddressList addresses(message.to() + message.cc() + message.bcc()); |
536 foreach(QMessageAddress address, addresses) { |
536 foreach(QMessageAddress address, addresses) { |
537 tmp = address.recipient(); |
537 tmp = address.addressee(); |
538 if (!caseSensitive) { |
538 if (!caseSensitive) { |
539 tmp = tmp.toLower(); |
539 tmp = tmp.toLower(); |
540 } |
540 } |
541 messageStrings.append(tmp); |
541 messageStrings.append(tmp); |
542 } |
542 } |
543 } else if (filter.d_ptr->_field == QMessageFilterPrivate::Sender) { |
543 } else if (filter.d_ptr->_field == QMessageFilterPrivate::Sender) { |
544 tmp = message.from().recipient(); |
544 tmp = message.from().addressee(); |
545 if (!caseSensitive) { |
545 if (!caseSensitive) { |
546 tmp = tmp.toLower(); |
546 tmp = tmp.toLower(); |
547 } |
547 } |
548 messageStrings.append(tmp); |
548 messageStrings.append(tmp); |
549 } else { // Subject |
549 } else { // Subject |
1752 return QMessageFilter::byType(type, QMessageDataComparator::Excludes); |
1752 return QMessageFilter::byType(type, QMessageDataComparator::Excludes); |
1753 } |
1753 } |
1754 |
1754 |
1755 QMessageFilter QMessageFilter::byType(QMessage::TypeFlags aType, QMessageDataComparator::InclusionComparator cmp) |
1755 QMessageFilter QMessageFilter::byType(QMessage::TypeFlags aType, QMessageDataComparator::InclusionComparator cmp) |
1756 { |
1756 { |
1757 QMessage::TypeFlags type(aType & (QMessage::Sms | QMessage::Email)); // strip Mms, Xmpp |
1757 QMessage::TypeFlags type(aType & (QMessage::Sms | QMessage::Email)); // strip Mms, InstantMessage |
1758 if (type == QMessage::Sms) { |
1758 if (type == QMessage::Sms) { |
1759 if (cmp == QMessageDataComparator::Includes) { |
1759 if (cmp == QMessageDataComparator::Includes) { |
1760 return QMessageFilter::byParentAccountId(QMessageAccount::defaultAccount(QMessage::Sms), QMessageDataComparator::Equal); |
1760 return QMessageFilter::byParentAccountId(QMessageAccount::defaultAccount(QMessage::Sms), QMessageDataComparator::Equal); |
1761 } else { |
1761 } else { |
1762 return QMessageFilter::byParentAccountId(QMessageAccount::defaultAccount(QMessage::Sms), QMessageDataComparator::NotEqual); |
1762 return QMessageFilter::byParentAccountId(QMessageAccount::defaultAccount(QMessage::Sms), QMessageDataComparator::NotEqual); |
1772 if (type == (QMessage::Sms | QMessage::Email)) { |
1772 if (type == (QMessage::Sms | QMessage::Email)) { |
1773 if (cmp == QMessageDataComparator::Includes) |
1773 if (cmp == QMessageDataComparator::Includes) |
1774 return QMessageFilter(); // inclusion, match all |
1774 return QMessageFilter(); // inclusion, match all |
1775 return ~QMessageFilter(); // exclusion, match none |
1775 return ~QMessageFilter(); // exclusion, match none |
1776 } |
1776 } |
1777 // Mms/Xmpp only |
1777 // Mms/InstantMessage only |
1778 if (cmp == QMessageDataComparator::Includes) |
1778 if (cmp == QMessageDataComparator::Includes) |
1779 return ~QMessageFilter(); // mms only inclusion, match none |
1779 return ~QMessageFilter(); // mms only inclusion, match none |
1780 return QMessageFilter(); // mms only exclusion, match all |
1780 return QMessageFilter(); // mms only exclusion, match all |
1781 } |
1781 } |
1782 |
1782 |