diff options
| author |  Robert Widmann <devteam.codafi@gmail.com> | 2016-02-02 17:25:37 -0500 |
|---|---|---|
| committer | Robert Widmann <devteam.codafi@gmail.com> | 2016-02-02 17:25:37 -0500 |
| commit | 62c0feb0bbba084b892d55c83314731fb2663a37 (patch) | |
| tree | 1afa302ac4e3cdaf30534a643ed1ef2a08b97a91 /src/objc/utils | |
| parent | ad12f19b3959e8930b7183a6acb26f6571c48686 (diff) | |
id -> instancetype
Diffstat (limited to 'src/objc/utils')
| -rw-r--r-- | src/objc/utils/MCOIndexSet+Private.h | 2 | ||||
| -rw-r--r-- | src/objc/utils/MCOIndexSet.mm | 4 | ||||
| -rw-r--r-- | src/objc/utils/MCOOperation+Private.h | 2 | ||||
| -rw-r--r-- | src/objc/utils/MCOOperation.mm | 2 | ||||
| -rw-r--r-- | src/objc/utils/NSObject+MCO.h | 2 |
5 files changed, 6 insertions, 6 deletions
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)); \ |