id -> instancetype

9 files changed, 15 insertions, 15 deletions

diff --git a/src/objc/abstract/MCOAbstractMessage.h b/src/objc/abstract/MCOAbstractMessage.h
index aa5db14b..ed858808 100644
--- a/src/objc/abstract/MCOAbstractMessage.h
+++ b/src/objc/abstract/MCOAbstractMessage.h
@@ -24,7 +24,7 @@ namespace mailcore {
 @interface MCOAbstractMessage : NSObject <NSCopying>
 
 #ifdef __cplusplus
-- (id) initWithMCMessage:(mailcore::AbstractMessage *)message NS_DESIGNATED_INITIALIZER;
+- (instancetype) initWithMCMessage:(mailcore::AbstractMessage *)message NS_DESIGNATED_INITIALIZER;
 #endif
 
 /** Header of the message. */
diff --git a/src/objc/abstract/MCOAbstractMessage.mm b/src/objc/abstract/MCOAbstractMessage.mm
index 8debf90d..3deaf886 100644
--- a/src/objc/abstract/MCOAbstractMessage.mm
+++ b/src/objc/abstract/MCOAbstractMessage.mm
@@ -28,14 +28,14 @@
     return _message;
 }
 
-- (id) init
+- (instancetype) init
 {
     self = [self initWithMCMessage:NULL];
     MCAssert(0);
     return nil;
 }
 
-- (id) initWithMCMessage:(mailcore::AbstractMessage *)message
+- (instancetype) initWithMCMessage:(mailcore::AbstractMessage *)message
 {
     self = [super init];
     
diff --git a/src/objc/abstract/MCOAbstractPart.h b/src/objc/abstract/MCOAbstractPart.h
index f3986af1..0e768215 100644
--- a/src/objc/abstract/MCOAbstractPart.h
+++ b/src/objc/abstract/MCOAbstractPart.h
@@ -50,7 +50,7 @@ namespace mailcore {
 @interface MCOAbstractPart : NSObject <NSCopying>
 
 #ifdef __cplusplus
-- (id) initWithMCPart:(mailcore::AbstractPart *)part NS_DESIGNATED_INITIALIZER;
+- (instancetype) initWithMCPart:(mailcore::AbstractPart *)part NS_DESIGNATED_INITIALIZER;
 #endif
 
 /** Returns type of the part (single / message part / multipart/mixed,
@@ -112,7 +112,7 @@ namespace mailcore {
 @interface MCOAbstractPart (MCOUnavailable)
 
 /** Do not invoke this directly. */
-- (id) init NS_UNAVAILABLE;
+- (instancetype) init NS_UNAVAILABLE;
 
 @end
 
diff --git a/src/objc/abstract/MCOAbstractPart.mm b/src/objc/abstract/MCOAbstractPart.mm
index e0d3a244..c7fb5ff4 100644
--- a/src/objc/abstract/MCOAbstractPart.mm
+++ b/src/objc/abstract/MCOAbstractPart.mm
@@ -26,14 +26,14 @@
     return _part;
 }
 
-- (id) init
+- (instancetype) init
 {
     self = [self initWithMCPart:NULL];
     MCAssert(0);
     return nil;
 }
 
-- (id) initWithMCPart:(mailcore::AbstractPart *)part
+- (instancetype) initWithMCPart:(mailcore::AbstractPart *)part
 {
     self = [super init];
     
diff --git a/src/objc/abstract/MCOAddress+Private.h b/src/objc/abstract/MCOAddress+Private.h
index dd4a61c3..57146ad2 100644
--- a/src/objc/abstract/MCOAddress+Private.h
+++ b/src/objc/abstract/MCOAddress+Private.h
@@ -17,7 +17,7 @@ namespace mailcore {
 
 @interface MCOAddress (Private)
 
-- (id) initWithMCAddress:(mailcore::Address *)address;
+- (instancetype) initWithMCAddress:(mailcore::Address *)address;
 + (MCOAddress *) addressWithMCAddress:(mailcore::Address *)address;
 
 @end
diff --git a/src/objc/abstract/MCOAddress.mm b/src/objc/abstract/MCOAddress.mm
index b03b6aa7..7c4ce639 100644
--- a/src/objc/abstract/MCOAddress.mm
+++ b/src/objc/abstract/MCOAddress.mm
@@ -108,7 +108,7 @@ MCO_SYNTHESIZE_NSCODING
 }
 
 
-- (id) init
+- (instancetype) init
 {
     self = [super init];
     
@@ -117,7 +117,7 @@ MCO_SYNTHESIZE_NSCODING
     return self;
 }
 
-- (id) initWithMCAddress:(mailcore::Address *)address
+- (instancetype) initWithMCAddress:(mailcore::Address *)address
 {
     self = [super init];
     
diff --git a/src/objc/abstract/MCOMessageHeader+Private.h b/src/objc/abstract/MCOMessageHeader+Private.h
index 073b1be6..269c725a 100644
--- a/src/objc/abstract/MCOMessageHeader+Private.h
+++ b/src/objc/abstract/MCOMessageHeader+Private.h
@@ -17,7 +17,7 @@ namespace mailcore {
 
 @interface MCOMessageHeader (Private)
 
-- (id) initWithMCMessageHeader:(mailcore::MessageHeader *)header;
+- (instancetype) initWithMCMessageHeader:(mailcore::MessageHeader *)header;
 + (MCOAddress *) addressWithMCMessageHeader:(mailcore::MessageHeader *)header;
 
 @end
diff --git a/src/objc/abstract/MCOMessageHeader.h b/src/objc/abstract/MCOMessageHeader.h
index 4f9a9cda..e68cf33c 100644
--- a/src/objc/abstract/MCOMessageHeader.h
+++ b/src/objc/abstract/MCOMessageHeader.h
@@ -64,7 +64,7 @@
 + (MCOMessageHeader *) headerWithData:(NSData *)data;
 
 /** Initialize a header with RFC 822 data.*/
-- (id) initWithData:(NSData *)data;
+- (instancetype) initWithData:(NSData *)data;
 
 /** Adds a custom header.*/
 - (void) setExtraHeaderValue:(NSString *)value forName:(NSString *)name;
diff --git a/src/objc/abstract/MCOMessageHeader.mm b/src/objc/abstract/MCOMessageHeader.mm
index 28a9e2b5..f2e055f9 100644
--- a/src/objc/abstract/MCOMessageHeader.mm
+++ b/src/objc/abstract/MCOMessageHeader.mm
@@ -49,7 +49,7 @@
     return _nativeHeader;
 }
 
-- (id) init
+- (instancetype) init
 {
     self = [super init];
     
@@ -58,7 +58,7 @@
     return self;
 }
 
-- (id) initWithMCMessageHeader:(mailcore::MessageHeader *)header
+- (instancetype) initWithMCMessageHeader:(mailcore::MessageHeader *)header
 {
     self = [super init];
     
@@ -73,7 +73,7 @@
     return [[[MCOMessageHeader alloc] initWithData:data] autorelease];
 }
 
-- (id) initWithData:(NSData *)data
+- (instancetype) initWithData:(NSData *)data
 {
     self = [self init];
     [self importHeadersData:data];