diff options
| author |  pfennema <paul@bryce.demon.nl> | 2013-12-05 08:37:54 +0100 |
|---|---|---|
| committer | pfennema <paul@bryce.demon.nl> | 2013-12-05 08:37:54 +0100 |
| commit | becc7cbaa1cb801ce91aa35c3df17537852db5f4 (patch) | |
| tree | 7b500ef1ea4e453806fe5a8fc0b4fb26889c64cd /src/core | |
| parent | e2e59990da11eba54050001fff58b466a58ce740 (diff) | |
Changed IMAPSearchKindUids to IMAPSearchKindUIDs to comply to naming conventions
Diffstat (limited to 'src/core')
| -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 |
4 files changed, 7 insertions, 7 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: { |