diff options
| -rw-r--r-- | src/core/abstract/MCMessageConstants.h | 2 | ||||
| -rw-r--r-- | src/core/imap/MCIMAPSearchExpression.cc | 8 | ||||
| -rw-r--r-- | src/core/imap/MCIMAPSearchExpression.h | 2 | ||||
| -rwxr-xr-x | src/core/imap/MCIMAPSession.cc | 2 | ||||
| -rw-r--r-- | src/objc/imap/MCOIMAPSearchExpression.h | 2 | ||||
| -rw-r--r-- | src/objc/imap/MCOIMAPSearchExpression.mm | 4 |
6 files changed, 10 insertions, 10 deletions
diff --git a/src/core/abstract/MCMessageConstants.h b/src/core/abstract/MCMessageConstants.h index fb09f46b..6fa20e57 100644 --- a/src/core/abstract/MCMessageConstants.h +++ b/src/core/abstract/MCMessageConstants.h @@ -171,7 +171,7 @@ namespace mailcore { IMAPSearchKindRecipient, // Recipient is the combination of To, CC and BCC IMAPSearchKindSubject, IMAPSearchKindContent, - IMAPSearchKindUids, + IMAPSearchKindUIDs, IMAPSearchKindHeader, IMAPSearchKindRead, IMAPSearchKindUnread, diff --git a/src/core/imap/MCIMAPSearchExpression.cc b/src/core/imap/MCIMAPSearchExpression.cc index 436c7977..054eaf02 100644 --- a/src/core/imap/MCIMAPSearchExpression.cc +++ b/src/core/imap/MCIMAPSearchExpression.cc @@ -66,8 +66,8 @@ String * IMAPSearchExpression::description() case IMAPSearchKindSubject: return String::stringWithUTF8Format("<%s:%p Subject %s>", MCUTF8(className()), this, MCUTF8(mValue->description())); - case IMAPSearchKindUids: - return String::stringWithUTF8Format("<%s:%p Uids %s>", MCUTF8(className()), this, + case IMAPSearchKindUIDs: + return String::stringWithUTF8Format("<%s:%p UIDs %s>", MCUTF8(className()), this, MCUTF8(mUids->description())); case IMAPSearchKindContent: return String::stringWithUTF8Format("<%s:%p Content %s>", MCUTF8(className()), this, @@ -155,10 +155,10 @@ IMAPSearchExpression * IMAPSearchExpression::searchContent(String * value) return (IMAPSearchExpression *) expr->autorelease(); } -IMAPSearchExpression * IMAPSearchExpression::searchUids(IndexSet * uids) +IMAPSearchExpression * IMAPSearchExpression::searchUIDs(IndexSet * uids) { IMAPSearchExpression * expr = new IMAPSearchExpression(); - expr->mKind = IMAPSearchKindUids; + expr->mKind = IMAPSearchKindUIDs; MC_SAFE_REPLACE_COPY(IndexSet,expr->mUids, uids); return (IMAPSearchExpression *) expr->autorelease(); } diff --git a/src/core/imap/MCIMAPSearchExpression.h b/src/core/imap/MCIMAPSearchExpression.h index 46f4f9d2..e4382637 100644 --- a/src/core/imap/MCIMAPSearchExpression.h +++ b/src/core/imap/MCIMAPSearchExpression.h @@ -34,7 +34,7 @@ namespace mailcore { static IMAPSearchExpression * searchSubject(String * value); static IMAPSearchExpression * searchContent(String * value); static IMAPSearchExpression * searchHeader(String * header, String * value); - static IMAPSearchExpression * searchUids(IndexSet * uids); + static IMAPSearchExpression * searchUIDs(IndexSet * uids); static IMAPSearchExpression * searchRead(); static IMAPSearchExpression * searchUnread(); static IMAPSearchExpression * searchFlagged(); diff --git a/src/core/imap/MCIMAPSession.cc b/src/core/imap/MCIMAPSession.cc index e5356023..5778a899 100755 --- a/src/core/imap/MCIMAPSession.cc +++ b/src/core/imap/MCIMAPSession.cc @@ -2623,7 +2623,7 @@ static struct mailimap_search_key * searchKeyFromSearchExpression(IMAPSearchExpr { return mailimap_search_key_new_text(strdup(expression->value()->UTF8Characters())); } - case IMAPSearchKindUids: + case IMAPSearchKindUIDs: return mailimap_search_key_new_uid(setFromIndexSet(expression->uids())); case IMAPSearchKindHeader: { diff --git a/src/objc/imap/MCOIMAPSearchExpression.h b/src/objc/imap/MCOIMAPSearchExpression.h index 735d6b07..d77df394 100644 --- a/src/objc/imap/MCOIMAPSearchExpression.h +++ b/src/objc/imap/MCOIMAPSearchExpression.h @@ -97,7 +97,7 @@ MCOIMAPSearchExpression * expr = [MCOIMAPSearchExpression searchUids:uids] **/ -+ (MCOIMAPSearchExpression *) searchUids:(MCOIndexSet *) uids; ++ (MCOIMAPSearchExpression *) searchUIDs:(MCOIndexSet *) uids; /** Creates a search expression that matches the content of a specific header. diff --git a/src/objc/imap/MCOIMAPSearchExpression.mm b/src/objc/imap/MCOIMAPSearchExpression.mm index 2c275054..d8a81d18 100644 --- a/src/objc/imap/MCOIMAPSearchExpression.mm +++ b/src/objc/imap/MCOIMAPSearchExpression.mm @@ -96,9 +96,9 @@ return MCO_TO_OBJC(mailcore::IMAPSearchExpression::searchContent([value mco_mcString])); } -+ (MCOIMAPSearchExpression *) searchUids:(MCOIndexSet *) uids ++ (MCOIMAPSearchExpression *) searchUIDs:(MCOIndexSet *) uids { - return MCO_TO_OBJC(mailcore::IMAPSearchExpression::searchUids(MCO_FROM_OBJC(mailcore::IndexSet, uids))); + return MCO_TO_OBJC(mailcore::IMAPSearchExpression::searchUIDs(MCO_FROM_OBJC(mailcore::IndexSet, uids))); } + (MCOIMAPSearchExpression *) searchHeader:(NSString *)header value:(NSString *)value { |