equal
deleted
inserted
replaced
86 case Sender: COMPARE(QMessagePrivate::senderName(*left), QMessagePrivate::senderName(*right)); |
86 case Sender: COMPARE(QMessagePrivate::senderName(*left), QMessagePrivate::senderName(*right)); |
87 case Recipients: { |
87 case Recipients: { |
88 QString leftStr; |
88 QString leftStr; |
89 QString rightStr; |
89 QString rightStr; |
90 foreach (QMessageAddress a, left->to() + left->cc() + left->bcc()) { |
90 foreach (QMessageAddress a, left->to() + left->cc() + left->bcc()) { |
91 leftStr.append(a.recipient() + ";"); |
91 leftStr.append(a.addressee() + ";"); |
92 } |
92 } |
93 foreach (QMessageAddress a, right->to() + right->cc() + right->bcc()) { |
93 foreach (QMessageAddress a, right->to() + right->cc() + right->bcc()) { |
94 rightStr.append(a.recipient() + ";"); |
94 rightStr.append(a.addressee() + ";"); |
95 } |
95 } |
96 COMPARE(leftStr, rightStr) |
96 COMPARE(leftStr, rightStr) |
97 } |
97 } |
98 case Subject: COMPARE(left->subject(), right->subject()) |
98 case Subject: COMPARE(left->subject(), right->subject()) |
99 case TimeStamp: COMPARE(left->date(), right->date()) |
99 case TimeStamp: COMPARE(left->date(), right->date()) |
221 foreach(QMessageFilter filter, previous) { |
221 foreach(QMessageFilter filter, previous) { |
222 result.append(QMessageFilter::byType(QMessage::NoType) & filter); |
222 result.append(QMessageFilter::byType(QMessage::NoType) & filter); |
223 result.append(QMessageFilter::byType(QMessage::Mms) & filter); |
223 result.append(QMessageFilter::byType(QMessage::Mms) & filter); |
224 result.append(QMessageFilter::byType(QMessage::Sms) & filter); |
224 result.append(QMessageFilter::byType(QMessage::Sms) & filter); |
225 result.append(QMessageFilter::byType(QMessage::Email) & filter); |
225 result.append(QMessageFilter::byType(QMessage::Email) & filter); |
226 result.append(QMessageFilter::byType(QMessage::Xmpp) & filter); |
226 result.append(QMessageFilter::byType(QMessage::InstantMessage) & filter); |
227 } |
227 } |
228 } break; |
228 } break; |
229 case Read: |
229 case Read: |
230 { |
230 { |
231 QList<QMessageFilter> previous(result); |
231 QList<QMessageFilter> previous(result); |