Removed MCONSArray category on MCOAddress. Renamed RFC822String and nonEncodedRFC822String to mco_RFC822StringForAddresses and mco_nonEncodedRFC822StringForAddresses per naming convention.

2 files changed, 28 insertions, 39 deletions

diff --git a/src/objc/abstract/MCOAddress.h b/src/objc/abstract/MCOAddress.h
index 4680edd6..c7552676 100644
--- a/src/objc/abstract/MCOAddress.h
+++ b/src/objc/abstract/MCOAddress.h
@@ -31,6 +31,17 @@
 // Example: [MCOAddress addressWithRFC822String:@"DINH Viêt Hoà <hoa@etpan.org>"]
 + (MCOAddress *) addressWithNonEncodedRFC822String:(NSString *)nonEncodedRFC822String;
 
+// Returns an NSArray of MCOAddress objects that contain the parsed
+// forms of the RFC822 encoded addresses.
+// For example: @[ @"DINH Vi=C3=AAt Ho=C3=A0 <hoa@etpan.org>" ]
++ (NSArray *) addressesWithRFC822String:(NSString *)string;
+
+// Returns an NSArray of MCOAddress objects that contain the parsed
+// forms of non-encoded RFC822 addresses.
+// For example: @[ "DINH Viêt Hoà <hoa@etpan.org>" ]
++ (NSArray *) addressesWithNonEncodedRFC822String:(NSString *)string;
+
+
 // Returns the display name of the address.
 @property (nonatomic, copy) NSString * displayName;
 
@@ -47,32 +58,13 @@
 
 @end
 
-@interface MCOAddress (MCONSArray)
-
-// Returns an NSArray of MCOAddress objects that contain the parsed
-// forms of the RFC822 encoded addresses.
-// For example: @[ @"DINH Vi=C3=AAt Ho=C3=A0 <hoa@etpan.org>" ]
-+ (NSArray *) addressesWithRFC822String:(NSString *)string;
-
-// Returns an NSArray of MCOAddress objects that contain the parsed
-// forms of non-encoded RFC822 addresses.
-// For example: @[ "DINH Viêt Hoà <hoa@etpan.org>" ]
-+ (NSArray *) addressesWithNonEncodedRFC822String:(NSString *)string;
-
-@end
-
 @interface NSArray (MCONSArray)
 
-// The receiver is an NSArray of MCOAddress.
-// Returns an NSArray of NSString objects separated by commas that contain the
-// RFC822 encoding of the addresses.
-// For example: @[ @"DINH Vi=C3=AAt Ho=C3=A0 <hoa@etpan.org>" ]
-- (NSString *) RFC822String;
+// Returns the RFC822 encoding of the addresses.
+- (NSString *) mco_RFC822StringForAddresses;
 
-// Returns an NSArray of NSString objects separated by commas that contain the
-// non-MIME-encoded RFC822 form of the addresses.
-// For example: @[ "DINH Viêt Hoà <hoa@etpan.org>" ]
-- (NSString *) nonEncodedRFC822String;
+// Returns the non-MIME-encoded RFC822 of the addresses.
+- (NSString *) mco_nonEncodedRFC822StringForAddresses;
 
 @end
 
diff --git a/src/objc/abstract/MCOAddress.mm b/src/objc/abstract/MCOAddress.mm
index a6fbb728..7a398421 100644
--- a/src/objc/abstract/MCOAddress.mm
+++ b/src/objc/abstract/MCOAddress.mm
@@ -83,6 +83,17 @@
     return result;
 }
 
++ (NSArray *) addressesWithRFC822String:(NSString *)string
+{
+	return [NSArray mco_arrayWithMCArray:mailcore::Address::addressesWithRFC822String(string.mco_mcString)];
+}
+
++ (NSArray *) addressesWithNonEncodedRFC822String:(NSString *)string
+{
+	return [NSArray mco_arrayWithMCArray:mailcore::Address::addressesWithNonEncodedRFC822String(string.mco_mcString)];
+}
+
+
 - (id) init
 {
     self = [super init];
@@ -136,28 +147,14 @@ MCO_OBJC_SYNTHESIZE_STRING(setMailbox, mailbox)
 
 @end
 
-@implementation MCOAddress (MCONSArray)
-
-+ (NSArray *) addressesWithRFC822String:(NSString *)string
-{
-	return [NSArray mco_arrayWithMCArray:mailcore::Address::addressesWithRFC822String(string.mco_mcString)];
-}
-
-+ (NSArray *) addressesWithNonEncodedRFC822String:(NSString *)string
-{	
-	return [NSArray mco_arrayWithMCArray:mailcore::Address::addressesWithNonEncodedRFC822String(string.mco_mcString)];
-}
-
-@end
-
 @implementation NSArray (MCONSArray)
 
-- (NSString *) RFC822String
+- (NSString *) mco_RFC822StringForAddresses
 {
 	return [NSString mco_stringWithMCString:mailcore::Address::RFC822StringForAddresses([self mco_mcArray])];
 }
 
-- (NSString *) nonEncodedRFC822String
+- (NSString *) mco_nonEncodedRFC822StringForAddresses
 {
 	return [NSString mco_stringWithMCString:mailcore::Address::nonEncodedRFC822StringForAddresses([self mco_mcArray ])];
 }