From 5d76e5f9a175e611ea7ef922619012381decf7fc Mon Sep 17 00:00:00 2001
From: pfennema <paul@bryce.demon.nl>
Date: Sun, 8 Dec 2013 10:33:17 +0100
Subject: Changed SearchKindCC and SearchKindBCC to SearchKindCc and
 SearchKindBcc and related code as well

---
 src/core/abstract/MCMessageConstants.h  |  6 +++---
 src/core/imap/MCIMAPSearchExpression.cc | 16 ++++++++--------
 src/core/imap/MCIMAPSearchExpression.h  |  4 ++--
 src/core/imap/MCIMAPSession.cc          | 12 ++++++------
 4 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'src/core')

diff --git a/src/core/abstract/MCMessageConstants.h b/src/core/abstract/MCMessageConstants.h
index 6fa20e57..a8f0a056 100644
--- a/src/core/abstract/MCMessageConstants.h
+++ b/src/core/abstract/MCMessageConstants.h
@@ -166,9 +166,9 @@ namespace mailcore {
         IMAPSearchKindNone,
         IMAPSearchKindFrom,
         IMAPSearchKindTo,
-        IMAPSearchKindCC,
-        IMAPSearchKindBCC,
-        IMAPSearchKindRecipient,   // Recipient is the combination of To, CC and BCC
+        IMAPSearchKindCc,
+        IMAPSearchKindBcc,
+        IMAPSearchKindRecipient,   // Recipient is the combination of To, Cc and Bcc
         IMAPSearchKindSubject,
         IMAPSearchKindContent,
         IMAPSearchKindUIDs,
diff --git a/src/core/imap/MCIMAPSearchExpression.cc b/src/core/imap/MCIMAPSearchExpression.cc
index 86f1e24b..e05ea1e4 100644
--- a/src/core/imap/MCIMAPSearchExpression.cc
+++ b/src/core/imap/MCIMAPSearchExpression.cc
@@ -53,11 +53,11 @@ String * IMAPSearchExpression::description()
         case IMAPSearchKindTo:
         return String::stringWithUTF8Format("<%s:%p To %s>", MCUTF8(className()), this,
             MCUTF8(mValue->description()));
-        case IMAPSearchKindCC:
-        return String::stringWithUTF8Format("<%s:%p CC %s>", MCUTF8(className()), this,
+        case IMAPSearchKindCc:
+        return String::stringWithUTF8Format("<%s:%p Cc %s>", MCUTF8(className()), this,
             MCUTF8(mValue->description()));
-        case IMAPSearchKindBCC:
-        return String::stringWithUTF8Format("<%s:%p BCC %s>", MCUTF8(className()), this,
+        case IMAPSearchKindBcc:
+        return String::stringWithUTF8Format("<%s:%p Bcc %s>", MCUTF8(className()), this,
             MCUTF8(mValue->description()));
         case IMAPSearchKindRecipient:
         return String::stringWithUTF8Format("<%s:%p Recipient %s>", MCUTF8(className()), this,
@@ -107,18 +107,18 @@ IMAPSearchExpression * IMAPSearchExpression::searchTo(String * value)
     return (IMAPSearchExpression *) expr->autorelease();
 }
 
-IMAPSearchExpression * IMAPSearchExpression::searchCC(String * value)
+IMAPSearchExpression * IMAPSearchExpression::searchCc(String * value)
 {
     IMAPSearchExpression * expr = new IMAPSearchExpression();
-    expr->mKind = IMAPSearchKindCC;
+    expr->mKind = IMAPSearchKindCc;
     MC_SAFE_REPLACE_COPY(String, expr->mValue, value);
     return (IMAPSearchExpression *) expr->autorelease();
 }
 
-IMAPSearchExpression * IMAPSearchExpression::searchBCC(String * value)
+IMAPSearchExpression * IMAPSearchExpression::searchBcc(String * value)
 {
     IMAPSearchExpression * expr = new IMAPSearchExpression();
-    expr->mKind = IMAPSearchKindBCC;
+    expr->mKind = IMAPSearchKindBcc;
     MC_SAFE_REPLACE_COPY(String, expr->mValue, value);
     return (IMAPSearchExpression *) expr->autorelease();
 }
diff --git a/src/core/imap/MCIMAPSearchExpression.h b/src/core/imap/MCIMAPSearchExpression.h
index 039ba512..ed1c4b36 100644
--- a/src/core/imap/MCIMAPSearchExpression.h
+++ b/src/core/imap/MCIMAPSearchExpression.h
@@ -28,8 +28,8 @@ namespace mailcore {
         static IMAPSearchExpression * searchAll();
         static IMAPSearchExpression * searchFrom(String * value);
         static IMAPSearchExpression * searchTo(String *value);
-        static IMAPSearchExpression * searchCC(String *value);
-        static IMAPSearchExpression * searchBCC(String *value);
+        static IMAPSearchExpression * searchCc(String *value);
+        static IMAPSearchExpression * searchBcc(String *value);
         static IMAPSearchExpression * searchRecipient(String * value);
         static IMAPSearchExpression * searchSubject(String * value);
         static IMAPSearchExpression * searchContent(String * value);
diff --git a/src/core/imap/MCIMAPSession.cc b/src/core/imap/MCIMAPSession.cc
index b67094af..205d53eb 100755
--- a/src/core/imap/MCIMAPSession.cc
+++ b/src/core/imap/MCIMAPSession.cc
@@ -2563,14 +2563,14 @@ IndexSet * IMAPSession::search(String * folder, IMAPSearchKind kind, String * se
             expr = IMAPSearchExpression::searchTo(searchString);
             break;
         }
-        case IMAPSearchKindCC:
+        case IMAPSearchKindCc:
         {
-            expr = IMAPSearchExpression::searchCC(searchString);
+            expr = IMAPSearchExpression::searchCc(searchString);
             break;
         }
-        case IMAPSearchKindBCC:
+        case IMAPSearchKindBcc:
         {
-            expr = IMAPSearchExpression::searchBCC(searchString);
+            expr = IMAPSearchExpression::searchBcc(searchString);
             break;
         }
         case IMAPSearchKindRecipient:
@@ -2612,11 +2612,11 @@ static struct mailimap_search_key * searchKeyFromSearchExpression(IMAPSearchExpr
         {
             return mailimap_search_key_new_to(strdup(expression->value()->UTF8Characters()));
         }
-        case IMAPSearchKindCC:
+        case IMAPSearchKindCc:
         {
             return mailimap_search_key_new_cc(strdup(expression->value()->UTF8Characters()));
         }
-        case IMAPSearchKindBCC:
+        case IMAPSearchKindBcc:
         {
             return mailimap_search_key_new_bcc(strdup(expression->value()->UTF8Characters()));
         }
-- 
cgit v1.2.3