Make IMAP ObjC bridge implementation consistent

6 files changed, 22 insertions, 22 deletions

diff --git a/src/objc/abstract/MCOAbstractMessage.h b/src/objc/abstract/MCOAbstractMessage.h
index c5a2f27f..e506e31e 100644
--- a/src/objc/abstract/MCOAbstractMessage.h
+++ b/src/objc/abstract/MCOAbstractMessage.h
@@ -17,7 +17,7 @@
 
 @interface MCOAbstractMessage : NSObject
 
-@property (nonatomic, retain) MCOMessageHeader * header;
+@property (nonatomic, strong) MCOMessageHeader * header;
 
 - (MCOAbstractPart *) partForContentID:(NSString *)contentID;
 - (MCOAbstractPart *) partForUniqueID:(NSString *)uniqueID;
diff --git a/src/objc/abstract/MCOAbstractMessagePart.h b/src/objc/abstract/MCOAbstractMessagePart.h
index 8675fc17..75cda3cd 100644
--- a/src/objc/abstract/MCOAbstractMessagePart.h
+++ b/src/objc/abstract/MCOAbstractMessagePart.h
@@ -17,8 +17,8 @@
 
 @interface MCOAbstractMessagePart : MCOAbstractPart
 
-@property (nonatomic, retain) MCOMessageHeader * header;
-@property (nonatomic, retain) MCOAbstractPart * mainPart;
+@property (nonatomic, strong) MCOMessageHeader * header;
+@property (nonatomic, strong) MCOAbstractPart * mainPart;
 
 @end
 
diff --git a/src/objc/abstract/MCOAbstractPart.h b/src/objc/abstract/MCOAbstractPart.h
index b46f6724..bc1f3b7e 100644
--- a/src/objc/abstract/MCOAbstractPart.h
+++ b/src/objc/abstract/MCOAbstractPart.h
@@ -32,7 +32,7 @@ typedef enum {
 @property (nonatomic, copy) NSString * contentID;
 @property (nonatomic, copy) NSString * contentLocation;
 @property (nonatomic, assign, getter=isInlineAttachment) BOOL inlineAttachment;
-@property (nonatomic, assign) MCOAbstractMessage * message;
+@property (nonatomic, weak) MCOAbstractMessage * message;
 
 - (MCOAbstractPart *) partForContentID:(NSString *)contentID;
 - (MCOAbstractPart *) partForUniqueID:(NSString *)uniqueID;
diff --git a/src/objc/abstract/MCOAddress.mm b/src/objc/abstract/MCOAddress.mm
index 6afb0134..da682582 100644
--- a/src/objc/abstract/MCOAddress.mm
+++ b/src/objc/abstract/MCOAddress.mm
@@ -26,6 +26,14 @@
     MCORegisterClass(self, &typeid(nativeType));
 }
 
+- (id) copyWithZone:(NSZone *)zone
+{
+    nativeType * nativeObject = (nativeType *) [self mco_mcObject]->copy();
+    id result = [[self class] mco_objectWithMCObject:nativeObject];
+    MC_SAFE_RELEASE(nativeObject);
+    return [result retain];
+}
+
 + (NSObject *) mco_objectWithMCObject:(mailcore::Object *)object
 {
     mailcore::Address * address = (mailcore::Address *) object;
@@ -107,14 +115,6 @@
     [super dealloc];
 }
 
-- (id) copyWithZone:(NSZone *)zone
-{
-    mailcore::Address * address = (mailcore::Address *) _nativeAddress->copy();
-    MCOAddress * result = [[MCOAddress alloc] initWithMCAddress:address];
-    MC_SAFE_RELEASE(address);
-    return result;
-}
-
 - (NSString *) description
 {
     return MCO_OBJC_BRIDGE_GET(description);
diff --git a/src/objc/abstract/MCOMessageHeader.h b/src/objc/abstract/MCOMessageHeader.h
index 09ed130e..350c1379 100644
--- a/src/objc/abstract/MCOMessageHeader.h
+++ b/src/objc/abstract/MCOMessageHeader.h
@@ -19,8 +19,8 @@
 @property (nonatomic, copy) NSString * messageID;
 @property (nonatomic, copy) NSArray * references;
 @property (nonatomic, copy) NSArray * inReplyTo;
-@property (nonatomic, retain) NSDate * date;
-@property (nonatomic, retain) NSDate * receivedDate;
+@property (nonatomic, strong) NSDate * date;
+@property (nonatomic, strong) NSDate * receivedDate;
 @property (nonatomic, copy) MCOAddress * sender;
 @property (nonatomic, copy) MCOAddress * from;
 @property (nonatomic, copy) NSArray * to;
diff --git a/src/objc/abstract/MCOMessageHeader.mm b/src/objc/abstract/MCOMessageHeader.mm
index 649819e9..5b5844d0 100644
--- a/src/objc/abstract/MCOMessageHeader.mm
+++ b/src/objc/abstract/MCOMessageHeader.mm
@@ -31,6 +31,14 @@
     MCORegisterClass(self, &typeid(nativeType));
 }
 
+- (id) copyWithZone:(NSZone *)zone
+{
+    nativeType * nativeObject = (nativeType *) [self mco_mcObject]->copy();
+    id result = [[self class] mco_objectWithMCObject:nativeObject];
+    MC_SAFE_RELEASE(nativeObject);
+    return [result retain];
+}
+
 + (id) mco_objectWithMCObject:(mailcore::Object *)object
 {
     mailcore::MessageHeader * header = (mailcore::MessageHeader *) object;
@@ -69,14 +77,6 @@
     return [[[self alloc] initWithMCMessageHeader:header] autorelease];
 }
 
-- (id) copyWithZone:(NSZone *)zone
-{
-    mailcore::MessageHeader * header = (mailcore::MessageHeader *) _nativeHeader->copy();
-    MCOMessageHeader * result = [[MCOMessageHeader alloc] initWithMCMessageHeader:header];
-    MC_SAFE_RELEASE(header);
-    return result;
-}
-
 - (NSString *) description
 {
     return MCO_OBJC_BRIDGE_GET(description);