diff options
Diffstat (limited to 'src')
43 files changed, 59 insertions, 59 deletions
diff --git a/src/core/basetypes/MCMainThreadMac.mm b/src/core/basetypes/MCMainThreadMac.mm index 5f6c5104..fe1ebb24 100644 --- a/src/core/basetypes/MCMainThreadMac.mm +++ b/src/core/basetypes/MCMainThreadMac.mm @@ -29,7 +29,7 @@ static void destroyDelayedCall(void * caller); @synthesize context = _context; @synthesize timer = _timer; -- (id) init +- (instancetype) init { self = [super init]; return self; 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]; diff --git a/src/objc/imap/MCOIMAPBaseOperation.mm b/src/objc/imap/MCOIMAPBaseOperation.mm index 70f0d5ff..ce5a26bc 100644 --- a/src/objc/imap/MCOIMAPBaseOperation.mm +++ b/src/objc/imap/MCOIMAPBaseOperation.mm @@ -47,7 +47,7 @@ private: MCO_OBJC_SYNTHESIZE_SCALAR(BOOL, bool, setUrgent, isUrgent) -- (id) initWithMCOperation:(mailcore::Operation *)op +- (instancetype) initWithMCOperation:(mailcore::Operation *)op { self = [super initWithMCOperation:op]; diff --git a/src/objc/imap/MCOIMAPFolder.mm b/src/objc/imap/MCOIMAPFolder.mm index 66e36beb..179a35ef 100644 --- a/src/objc/imap/MCOIMAPFolder.mm +++ b/src/objc/imap/MCOIMAPFolder.mm @@ -37,7 +37,7 @@ return [[[self alloc] initWithMCFolder:folder] autorelease]; } -- (id) init +- (instancetype) init { mailcore::IMAPFolder * folder = new mailcore::IMAPFolder(); self = [self initWithMCFolder:folder]; @@ -46,7 +46,7 @@ return self; } -- (id) initWithMCFolder:(mailcore::IMAPFolder *)folder +- (instancetype) initWithMCFolder:(mailcore::IMAPFolder *)folder { self = [super init]; diff --git a/src/objc/imap/MCOIMAPFolderInfo.mm b/src/objc/imap/MCOIMAPFolderInfo.mm index 50c7f995..1f4aea7e 100644 --- a/src/objc/imap/MCOIMAPFolderInfo.mm +++ b/src/objc/imap/MCOIMAPFolderInfo.mm @@ -22,7 +22,7 @@ MCORegisterClass(self, &typeid(nativeType)); } -- (id) initWithMCFolderInfo:(mailcore::IMAPFolderInfo *)info +- (instancetype) initWithMCFolderInfo:(mailcore::IMAPFolderInfo *)info { self = [super init]; diff --git a/src/objc/imap/MCOIMAPFolderStatus.mm b/src/objc/imap/MCOIMAPFolderStatus.mm index 1214bdff..26ff5ec8 100644 --- a/src/objc/imap/MCOIMAPFolderStatus.mm +++ b/src/objc/imap/MCOIMAPFolderStatus.mm @@ -22,7 +22,7 @@ MCORegisterClass(self, &typeid(nativeType)); } -- (id) initWithMCFolderStatus:(mailcore::IMAPFolderStatus *)status +- (instancetype) initWithMCFolderStatus:(mailcore::IMAPFolderStatus *)status { self = [super init]; diff --git a/src/objc/imap/MCOIMAPIdentity.mm b/src/objc/imap/MCOIMAPIdentity.mm index 8edc441e..d88680f9 100644 --- a/src/objc/imap/MCOIMAPIdentity.mm +++ b/src/objc/imap/MCOIMAPIdentity.mm @@ -23,7 +23,7 @@ MCORegisterClass(self, &typeid(nativeType)); } -- (id) init +- (instancetype) init { mailcore::IMAPIdentity * identity = new mailcore::IMAPIdentity(); self = [self initWithMCIdentity:identity]; @@ -32,7 +32,7 @@ return self; } -- (id) initWithMCIdentity:(mailcore::IMAPIdentity *)identity +- (instancetype) initWithMCIdentity:(mailcore::IMAPIdentity *)identity { self = [super init]; diff --git a/src/objc/imap/MCOIMAPMessage.mm b/src/objc/imap/MCOIMAPMessage.mm index 4c16a17a..93eb3148 100644 --- a/src/objc/imap/MCOIMAPMessage.mm +++ b/src/objc/imap/MCOIMAPMessage.mm @@ -24,7 +24,7 @@ MCORegisterClass(self, &typeid(nativeType)); } -- (id) init +- (instancetype) init { mailcore::IMAPMessage * msg = new mailcore::IMAPMessage(); self = [self initWithMCMessage:msg]; diff --git a/src/objc/imap/MCOIMAPNamespace.mm b/src/objc/imap/MCOIMAPNamespace.mm index e6181d87..b2cfd8a4 100644 --- a/src/objc/imap/MCOIMAPNamespace.mm +++ b/src/objc/imap/MCOIMAPNamespace.mm @@ -37,7 +37,7 @@ return [[[self alloc] initWithMCNamespace:ns] autorelease]; } -- (id) init +- (instancetype) init { mailcore::IMAPNamespace * ns = new mailcore::IMAPNamespace(); self = [self initWithMCNamespace:ns]; @@ -46,7 +46,7 @@ return self; } -- (id) initWithMCNamespace:(mailcore::IMAPNamespace *)ns +- (instancetype) initWithMCNamespace:(mailcore::IMAPNamespace *)ns { self = [super init]; diff --git a/src/objc/imap/MCOIMAPNamespaceItem.mm b/src/objc/imap/MCOIMAPNamespaceItem.mm index 98d3a889..783d224e 100644 --- a/src/objc/imap/MCOIMAPNamespaceItem.mm +++ b/src/objc/imap/MCOIMAPNamespaceItem.mm @@ -37,7 +37,7 @@ return [[[self alloc] initWithMCNamespaceItem:item] autorelease]; } -- (id) init +- (instancetype) init { mailcore::IMAPNamespaceItem * item = new mailcore::IMAPNamespaceItem(); self = [self initWithMCNamespaceItem:item]; @@ -46,7 +46,7 @@ return self; } -- (id) initWithMCNamespaceItem:(mailcore::IMAPNamespaceItem *)item +- (instancetype) initWithMCNamespaceItem:(mailcore::IMAPNamespaceItem *)item { self = [super init]; diff --git a/src/objc/imap/MCOIMAPSearchExpression.mm b/src/objc/imap/MCOIMAPSearchExpression.mm index 57dd928e..179375a0 100644 --- a/src/objc/imap/MCOIMAPSearchExpression.mm +++ b/src/objc/imap/MCOIMAPSearchExpression.mm @@ -42,7 +42,7 @@ return _nativeExpr; } -- (id) initWithMCExpression:(mailcore::IMAPSearchExpression *)expr +- (instancetype) initWithMCExpression:(mailcore::IMAPSearchExpression *)expr { self = [super init]; diff --git a/src/objc/imap/MCOIMAPSession.mm b/src/objc/imap/MCOIMAPSession.mm index 362227f6..e978afac 100755 --- a/src/objc/imap/MCOIMAPSession.mm +++ b/src/objc/imap/MCOIMAPSession.mm @@ -73,7 +73,7 @@ private: return _session; } -- (id)init { +- (instancetype) init { self = [super init]; _session = new IMAPAsyncSession(); diff --git a/src/objc/nntp/MCONNTPFetchArticleOperation.mm b/src/objc/nntp/MCONNTPFetchArticleOperation.mm index 1d43d1b6..611e7ec9 100644 --- a/src/objc/nntp/MCONNTPFetchArticleOperation.mm +++ b/src/objc/nntp/MCONNTPFetchArticleOperation.mm @@ -60,7 +60,7 @@ private: return [[[self alloc] initWithMCOperation:op] autorelease]; } -- (id)initWithMCOperation:(mailcore::Operation *)op +- (instancetype) initWithMCOperation:(mailcore::Operation *)op { self = [super initWithMCOperation:op]; diff --git a/src/objc/nntp/MCONNTPGroupInfo.mm b/src/objc/nntp/MCONNTPGroupInfo.mm index 342192f2..af6b9b9a 100644 --- a/src/objc/nntp/MCONNTPGroupInfo.mm +++ b/src/objc/nntp/MCONNTPGroupInfo.mm @@ -48,7 +48,7 @@ return MCO_OBJC_BRIDGE_GET(description); } -- (id) initWithMCNNTPGroupInfo:(mailcore::NNTPGroupInfo *)info +- (instancetype) initWithMCNNTPGroupInfo:(mailcore::NNTPGroupInfo *)info { self = [super init]; diff --git a/src/objc/nntp/MCONNTPSession.mm b/src/objc/nntp/MCONNTPSession.mm index cc47ae5e..8237145c 100644 --- a/src/objc/nntp/MCONNTPSession.mm +++ b/src/objc/nntp/MCONNTPSession.mm @@ -71,7 +71,7 @@ private: return MCO_OBJC_BRIDGE_GET(description); } -- (id)init { +- (instancetype) init { self = [super init]; _session = new mailcore::NNTPAsyncSession(); diff --git a/src/objc/pop/MCOPOPFetchMessageOperation.mm b/src/objc/pop/MCOPOPFetchMessageOperation.mm index f77d9f5b..944d7562 100644 --- a/src/objc/pop/MCOPOPFetchMessageOperation.mm +++ b/src/objc/pop/MCOPOPFetchMessageOperation.mm @@ -60,7 +60,7 @@ private: return [[[self alloc] initWithMCOperation:op] autorelease]; } -- (id)initWithMCOperation:(mailcore::Operation *)op +- (instancetype) initWithMCOperation:(mailcore::Operation *)op { self = [super initWithMCOperation:op]; diff --git a/src/objc/pop/MCOPOPMessageInfo.mm b/src/objc/pop/MCOPOPMessageInfo.mm index 55a4e1b6..83ee36a9 100644 --- a/src/objc/pop/MCOPOPMessageInfo.mm +++ b/src/objc/pop/MCOPOPMessageInfo.mm @@ -48,7 +48,7 @@ return MCO_OBJC_BRIDGE_GET(description); } -- (id) initWithMCPOPMessageInfo:(mailcore::POPMessageInfo *)info +- (instancetype) initWithMCPOPMessageInfo:(mailcore::POPMessageInfo *)info { self = [super init]; diff --git a/src/objc/pop/MCOPOPSession.mm b/src/objc/pop/MCOPOPSession.mm index 55e8986e..61936de4 100644 --- a/src/objc/pop/MCOPOPSession.mm +++ b/src/objc/pop/MCOPOPSession.mm @@ -71,7 +71,7 @@ private: return MCO_OBJC_BRIDGE_GET(description); } -- (id)init { +- (instancetype) init { self = [super init]; _session = new mailcore::POPAsyncSession(); diff --git a/src/objc/provider/MCOAccountValidator.mm b/src/objc/provider/MCOAccountValidator.mm index 34d8992b..0aa9a393 100644 --- a/src/objc/provider/MCOAccountValidator.mm +++ b/src/objc/provider/MCOAccountValidator.mm @@ -71,7 +71,7 @@ MCO_OBJC_SYNTHESIZE_BOOL(setImapEnabled, isImapEnabled) MCO_OBJC_SYNTHESIZE_BOOL(setPopEnabled, isPopEnabled) MCO_OBJC_SYNTHESIZE_BOOL(setSmtpEnabled, isSmtpEnabled) -- (id) init +- (instancetype) init { mailcore::AccountValidator * validator = new mailcore::AccountValidator(); self = [self initWithMCValidator:validator]; @@ -79,7 +79,7 @@ MCO_OBJC_SYNTHESIZE_BOOL(setSmtpEnabled, isSmtpEnabled) return self; } -- (id) initWithMCValidator:(mailcore::AccountValidator *)validator +- (instancetype) initWithMCValidator:(mailcore::AccountValidator *)validator { self = [super initWithMCOperation:validator]; diff --git a/src/objc/provider/MCOMailProvider.h b/src/objc/provider/MCOMailProvider.h index 2a568016..f2deff4e 100644 --- a/src/objc/provider/MCOMailProvider.h +++ b/src/objc/provider/MCOMailProvider.h @@ -16,7 +16,7 @@ @property (nonatomic, copy) NSString * identifier; -- (id) initWithInfo:(NSDictionary *)info; +- (instancetype) initWithInfo:(NSDictionary *)info; /** A list of ways that you can connect to the IMAP server @@ -88,6 +88,6 @@ @interface MCOMailProvider (MCOUnavailable) /** Do not invoke this directly. */ -- (id) init NS_UNAVAILABLE; +- (instancetype) init NS_UNAVAILABLE; @end diff --git a/src/objc/provider/MCOMailProvider.mm b/src/objc/provider/MCOMailProvider.mm index 73be461f..558bb124 100644 --- a/src/objc/provider/MCOMailProvider.mm +++ b/src/objc/provider/MCOMailProvider.mm @@ -39,7 +39,7 @@ return [[[self alloc] initWithMCProvider:provider] autorelease]; } -- (id) initWithInfo:(NSDictionary *)info +- (instancetype) initWithInfo:(NSDictionary *)info { self = [super init]; @@ -49,7 +49,7 @@ return self; } -- (id) initWithMCProvider:(mailcore::MailProvider *)provider +- (instancetype) initWithMCProvider:(mailcore::MailProvider *)provider { self = [super init]; diff --git a/src/objc/provider/MCOMailProvidersManager.mm b/src/objc/provider/MCOMailProvidersManager.mm index c61b25cf..6b31bc4e 100644 --- a/src/objc/provider/MCOMailProvidersManager.mm +++ b/src/objc/provider/MCOMailProvidersManager.mm @@ -26,7 +26,7 @@ return sharedInstance; } -- (id) init +- (instancetype) init { NSString * filename; diff --git a/src/objc/provider/MCONetService.h b/src/objc/provider/MCONetService.h index af0f3d14..f186e811 100644 --- a/src/objc/provider/MCONetService.h +++ b/src/objc/provider/MCONetService.h @@ -29,7 +29,7 @@ + (MCONetService *) serviceWithInfo:(NSDictionary *)info; -- (id) initWithInfo:(NSDictionary *)info; +- (instancetype) initWithInfo:(NSDictionary *)info; - (NSDictionary *) info; /** @@ -43,6 +43,6 @@ @interface MCONetService (MCOUnavailable) /** Do not invoke this directly. */ -- (id) init NS_UNAVAILABLE; +- (instancetype) init NS_UNAVAILABLE; @end diff --git a/src/objc/provider/MCONetService.mm b/src/objc/provider/MCONetService.mm index e24ec909..6f1ce53a 100644 --- a/src/objc/provider/MCONetService.mm +++ b/src/objc/provider/MCONetService.mm @@ -40,7 +40,7 @@ return [[[self alloc] initWithInfo:info] autorelease]; } -- (id) initWithInfo:(NSDictionary *)info +- (instancetype) initWithInfo:(NSDictionary *)info { self = [super init]; @@ -50,7 +50,7 @@ return self; } -- (id) initWithNetService:(mailcore::NetService *)netService +- (instancetype) initWithNetService:(mailcore::NetService *)netService { self = [super init]; diff --git a/src/objc/rfc822/MCOAttachment.mm b/src/objc/rfc822/MCOAttachment.mm index d7cbadc4..f19f608c 100644 --- a/src/objc/rfc822/MCOAttachment.mm +++ b/src/objc/rfc822/MCOAttachment.mm @@ -31,7 +31,7 @@ return [[[self alloc] initWithMCPart:attachment] autorelease]; } -- (id) init +- (instancetype) init { mailcore::Attachment * attachment = new mailcore::Attachment(); self = [super initWithMCPart:attachment]; diff --git a/src/objc/rfc822/MCOMessageBuilder.mm b/src/objc/rfc822/MCOMessageBuilder.mm index 84cff18d..84cc37f2 100644 --- a/src/objc/rfc822/MCOMessageBuilder.mm +++ b/src/objc/rfc822/MCOMessageBuilder.mm @@ -22,7 +22,7 @@ MCORegisterClass(self, &typeid(nativeType)); } -- (id)init +- (instancetype) init { mailcore::MessageBuilder * message = new mailcore::MessageBuilder(); self = [super initWithMCMessage:message]; diff --git a/src/objc/rfc822/MCOMessageParser.h b/src/objc/rfc822/MCOMessageParser.h index 6bbed0be..c0e3f37c 100644 --- a/src/objc/rfc822/MCOMessageParser.h +++ b/src/objc/rfc822/MCOMessageParser.h @@ -26,7 +26,7 @@ + (MCOMessageParser *) messageParserWithData:(NSData *)data; /** data is the RFC 822 formatted message.*/ -- (id) initWithData:(NSData *)data; +- (instancetype) initWithData:(NSData *)data; - (void) dealloc; /** It's the main part of the message. It can be MCOMessagePart, MCOMultipart or MCOAttachment.*/ diff --git a/src/objc/rfc822/MCOMessageParser.mm b/src/objc/rfc822/MCOMessageParser.mm index 228a27b9..55463a18 100644 --- a/src/objc/rfc822/MCOMessageParser.mm +++ b/src/objc/rfc822/MCOMessageParser.mm @@ -36,7 +36,7 @@ return [[[MCOMessageParser alloc] initWithData:data] autorelease]; } -- (id) initWithData:(NSData *)data +- (instancetype) initWithData:(NSData *)data { mailcore::MessageParser * message = new mailcore::MessageParser((CFDataRef) data); self = [super initWithMCMessage:message]; diff --git a/src/objc/smtp/MCOSMTPSendOperation.mm b/src/objc/smtp/MCOSMTPSendOperation.mm index 95ff8282..e02550da 100644 --- a/src/objc/smtp/MCOSMTPSendOperation.mm +++ b/src/objc/smtp/MCOSMTPSendOperation.mm @@ -61,7 +61,7 @@ private: return [[[self alloc] initWithMCOperation:op] autorelease]; } -- (id) initWithMCOperation:(mailcore::Operation *)op +- (instancetype) initWithMCOperation:(mailcore::Operation *)op { self = [super initWithMCOperation:op]; diff --git a/src/objc/smtp/MCOSMTPSession.mm b/src/objc/smtp/MCOSMTPSession.mm index eb48f3fb..9bcbd48e 100644 --- a/src/objc/smtp/MCOSMTPSession.mm +++ b/src/objc/smtp/MCOSMTPSession.mm @@ -69,7 +69,7 @@ private: return _session; } -- (id)init { +- (instancetype) init { self = [super init]; _session = new mailcore::SMTPAsyncSession(); diff --git a/src/objc/utils/MCOIndexSet+Private.h b/src/objc/utils/MCOIndexSet+Private.h index ad7cd1ba..8b45279f 100644 --- a/src/objc/utils/MCOIndexSet+Private.h +++ b/src/objc/utils/MCOIndexSet+Private.h @@ -13,7 +13,7 @@ #ifdef __cplusplus @interface MCOIndexSet (Private) -- (id) initWithMCIndexSet:(mailcore::IndexSet *)indexSet; +- (instancetype) initWithMCIndexSet:(mailcore::IndexSet *)indexSet; @end #endif diff --git a/src/objc/utils/MCOIndexSet.mm b/src/objc/utils/MCOIndexSet.mm index 3f113073..53d8d427 100644 --- a/src/objc/utils/MCOIndexSet.mm +++ b/src/objc/utils/MCOIndexSet.mm @@ -44,7 +44,7 @@ MCO_SYNTHESIZE_NSCODING return _indexSet; } -- (id) init +- (instancetype) init { mailcore::IndexSet * indexSet = new mailcore::IndexSet(); self = [self initWithMCIndexSet:indexSet]; @@ -52,7 +52,7 @@ MCO_SYNTHESIZE_NSCODING return self; } -- (id) initWithMCIndexSet:(mailcore::IndexSet *)indexSet +- (instancetype) initWithMCIndexSet:(mailcore::IndexSet *)indexSet { self = [super init]; _indexSet = indexSet; diff --git a/src/objc/utils/MCOOperation+Private.h b/src/objc/utils/MCOOperation+Private.h index 01ad7741..aff266d3 100644 --- a/src/objc/utils/MCOOperation+Private.h +++ b/src/objc/utils/MCOOperation+Private.h @@ -20,7 +20,7 @@ namespace mailcore { @interface MCOOperation (Private) #ifdef __cplusplus -- (id) initWithMCOperation:(mailcore::Operation *)op; +- (instancetype) initWithMCOperation:(mailcore::Operation *)op; #endif - (void) start; @end diff --git a/src/objc/utils/MCOOperation.mm b/src/objc/utils/MCOOperation.mm index cabb9a61..fe589c78 100644 --- a/src/objc/utils/MCOOperation.mm +++ b/src/objc/utils/MCOOperation.mm @@ -56,7 +56,7 @@ public: return _operation; } -- (id) initWithMCOperation:(Operation *)op +- (instancetype) initWithMCOperation:(Operation *)op { self = [super init]; diff --git a/src/objc/utils/NSObject+MCO.h b/src/objc/utils/NSObject+MCO.h index 923cc263..e879a39f 100644 --- a/src/objc/utils/NSObject+MCO.h +++ b/src/objc/utils/NSObject+MCO.h @@ -79,7 +79,7 @@ MCO_NATIVE_INSTANCE->setter((mcType) getter); \ } #define MCO_SYNTHESIZE_NSCODING \ -- (id) initWithCoder:(NSCoder *)coder \ +- (instancetype) initWithCoder:(NSCoder *)coder \ { \ mailcore::HashMap * serializable = MCO_FROM_OBJC(mailcore::HashMap, [coder decodeObjectForKey:@"info"]); \ self = MCO_TO_OBJC(mailcore::Object::objectWithSerializable(serializable)); \ |