aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/core/abstract/MCMessageConstants.h2
-rw-r--r--src/core/imap/MCIMAPSearchExpression.cc4
-rw-r--r--src/core/imap/MCIMAPSearchExpression.h2
-rwxr-xr-xsrc/core/imap/MCIMAPSession.cc2
-rw-r--r--src/objc/imap/MCOIMAPSearchExpression.h6
-rw-r--r--src/objc/imap/MCOIMAPSearchExpression.mm4
6 files changed, 10 insertions, 10 deletions
diff --git a/src/core/abstract/MCMessageConstants.h b/src/core/abstract/MCMessageConstants.h
index 7cad4f5a..f5d7f259 100644
--- a/src/core/abstract/MCMessageConstants.h
+++ b/src/core/abstract/MCMessageConstants.h
@@ -192,7 +192,7 @@ namespace mailcore {
IMAPSearchKindSizeLarger,
IMAPSearchKindSizeSmaller,
IMAPSearchKindGmailThreadID,
- IMAPSearchKindGmailRAW,
+ IMAPSearchKindGmailRaw,
IMAPSearchKindOr,
IMAPSearchKindAnd,
};
diff --git a/src/core/imap/MCIMAPSearchExpression.cc b/src/core/imap/MCIMAPSearchExpression.cc
index 5437ffa5..c4455ff8 100644
--- a/src/core/imap/MCIMAPSearchExpression.cc
+++ b/src/core/imap/MCIMAPSearchExpression.cc
@@ -313,10 +313,10 @@ IMAPSearchExpression * IMAPSearchExpression::searchGmailThreadID(uint64_t number
return (IMAPSearchExpression *) expr->autorelease();
}
-IMAPSearchExpression * IMAPSearchExpression::searchGmailRAW(String * searchExpr)
+IMAPSearchExpression * IMAPSearchExpression::searchGmailRaw(String * searchExpr)
{
IMAPSearchExpression * expr = new IMAPSearchExpression();
- expr->mKind = IMAPSearchKindGmailRAW;
+ expr->mKind = IMAPSearchKindGmailRaw;
expr->mValue = searchExpr;
return (IMAPSearchExpression *) expr->autorelease();
}
diff --git a/src/core/imap/MCIMAPSearchExpression.h b/src/core/imap/MCIMAPSearchExpression.h
index b757e8b3..d71a3f82 100644
--- a/src/core/imap/MCIMAPSearchExpression.h
+++ b/src/core/imap/MCIMAPSearchExpression.h
@@ -54,7 +54,7 @@ namespace mailcore {
static IMAPSearchExpression * searchSizeLarger(uint32_t size);
static IMAPSearchExpression * searchSizeSmaller(uint32_t size);
static IMAPSearchExpression * searchGmailThreadID(uint64_t number);
- static IMAPSearchExpression * searchGmailRAW(String * expr);
+ static IMAPSearchExpression * searchGmailRaw(String * expr);
static IMAPSearchExpression * searchAnd(IMAPSearchExpression * left, IMAPSearchExpression * right);
static IMAPSearchExpression * searchOr(IMAPSearchExpression * left, IMAPSearchExpression * right);
diff --git a/src/core/imap/MCIMAPSession.cc b/src/core/imap/MCIMAPSession.cc
index 093d6fd7..a2ab6a6f 100755
--- a/src/core/imap/MCIMAPSession.cc
+++ b/src/core/imap/MCIMAPSession.cc
@@ -2791,7 +2791,7 @@ static struct mailimap_search_key * searchKeyFromSearchExpression(IMAPSearchExpr
{
return mailimap_search_key_new_smaller( (uint32_t) expression->longNumber());
}
- case IMAPSearchKindGmailRAW:
+ case IMAPSearchKindGmailRaw:
{
return mailimap_search_key_new_xgmraw(strdup(expression->value()->UTF8Characters()));
}
diff --git a/src/objc/imap/MCOIMAPSearchExpression.h b/src/objc/imap/MCOIMAPSearchExpression.h
index fa9865fc..be293285 100644
--- a/src/objc/imap/MCOIMAPSearchExpression.h
+++ b/src/objc/imap/MCOIMAPSearchExpression.h
@@ -288,14 +288,14 @@
+ (MCOIMAPSearchExpression *) searchGmailThreadID:(uint64_t)number;
/**
- Creates a search expression that gets emails that match a gmail RAW search
+ Creates a search expression that gets emails that match a gmail Raw search
expression.
Example:
- MCOIMAPSearchExpression * expr = [MCOIMAPSearchExpression searchGmailRAW:@"has:attachment in:unread"]
+ MCOIMAPSearchExpression * expr = [MCOIMAPSearchExpression searchGmailRaw:@"has:attachment in:unread"]
*/
-+ (MCOIMAPSearchExpression *) searchGmailRAW:(NSString *)expr;
++ (MCOIMAPSearchExpression *) searchGmailRaw:(NSString *)expr;
/**
diff --git a/src/objc/imap/MCOIMAPSearchExpression.mm b/src/objc/imap/MCOIMAPSearchExpression.mm
index af4044a4..a6c89e8d 100644
--- a/src/objc/imap/MCOIMAPSearchExpression.mm
+++ b/src/objc/imap/MCOIMAPSearchExpression.mm
@@ -200,9 +200,9 @@
return MCO_TO_OBJC(mailcore::IMAPSearchExpression::searchGmailThreadID(number));
}
-+ (MCOIMAPSearchExpression *) searchGmailRAW:(NSString *)expr
++ (MCOIMAPSearchExpression *) searchGmailRaw:(NSString *)expr
{
- return MCO_TO_OBJC(mailcore::IMAPSearchExpression::searchGmailRAW([expr mco_mcString]));
+ return MCO_TO_OBJC(mailcore::IMAPSearchExpression::searchGmailRaw([expr mco_mcString]));
}
+ (MCOIMAPSearchExpression *) searchAnd:(MCOIMAPSearchExpression *)expression other:(MCOIMAPSearchExpression *)other