instancetype support.

rentzsch · Aug 24, 2015 · ddf66cd · ddf66cd
1 parent 030e72a
commit ddf66cd
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 11 deletions.
diff --git a/MiscMerge/NSNull.h b/MiscMerge/NSNull.h
@@ -44,7 +44,7 @@
 - (id)copy;
 
 - (void)encodeWithCoder:(NSCoder *)aCoder;
-- (id)initWithCoder:(NSCoder *)aDecoder;
+- (instancetype)initWithCoder:(NSCoder *)aDecoder;
 
 - (id)replacementObjectForCoder:(NSCoder *)aCoder;
 

diff --git a/MiscMerge/_MiscMergeIfCommand.m b/MiscMerge/_MiscMergeIfCommand.m
@@ -23,7 +23,7 @@
 
 @implementation _MiscMergeIfCommand
 
-- (id)init
+- (instancetype)init
 {
     [super init];
     trueBlock = [[MiscMergeCommandBlock alloc] initWithOwner:self];

diff --git a/ddcli/DDCliApplication.m b/ddcli/DDCliApplication.m
@@ -39,7 +39,7 @@ + (DDCliApplication *) sharedApplication;
     return DDCliApp;
 }
 
-- (id) init;
+- (instancetype) init;
 {
     self = [super init];
     if (self == nil)

diff --git a/ddcli/DDCliParseException.h b/ddcli/DDCliParseException.h
@@ -52,7 +52,7 @@
  * @param exitCode Desired exit code
  * @return New exception
  */
-- (id) initWithReason: (NSString *) reason
+- (instancetype) initWithReason: (NSString *) reason
              exitCode: (int) exitCode;
 
 /**

diff --git a/ddcli/DDCliParseException.m b/ddcli/DDCliParseException.m
@@ -34,7 +34,7 @@ + (DDCliParseException *) parseExceptionWithReason: (NSString *) reason
                                 exitCode: exitCode] autorelease];
 }
 
-- (id) initWithReason: (NSString *) reason
+- (instancetype) initWithReason: (NSString *) reason
              exitCode: (int) exitCode;
 {
     self = [super initWithName: NSStringFromClass([self class])

diff --git a/ddcli/DDGetoptLongParser.h b/ddcli/DDGetoptLongParser.h
@@ -100,7 +100,7 @@ typedef struct
  *
  * @param target Object that receives target messages.
  */
-- (id) initWithTarget: (id) target;
+- (instancetype) initWithTarget: (id) target;
 
 /**
  * Returns the target object.

diff --git a/ddcli/DDGetoptLongParser.m b/ddcli/DDGetoptLongParser.m
@@ -47,7 +47,7 @@ + (DDGetoptLongParser *) optionsWithTarget: (id) target
     return [[[self alloc] initWithTarget: target] autorelease];
 }
 
-- (id) initWithTarget: (id) target
+- (instancetype) initWithTarget: (id) target
 {
     self = [super init];
     if (self == nil)

diff --git a/mogenerator.m b/mogenerator.m
@@ -592,7 +592,7 @@ @interface MogeneratorTemplateDesc : NSObject {
     NSString *templateName;
     NSString *templatePath;
 }
-- (id)initWithName:(NSString*)name_ path:(NSString*)path_;
+- (instancetype)initWithName:(NSString*)name_ path:(NSString*)path_;
 - (NSString*)templateName;
 - (void)setTemplateName:(NSString*)name_;
 - (NSString*)templatePath;
@@ -1200,7 +1200,7 @@ - (int)application:(DDCliApplication*)app runWithArguments:(NSArray*)arguments {
 
 @implementation MogeneratorTemplateDesc
 
-- (id)initWithName:(NSString*)name_ path:(NSString*)path_ {
+- (instancetype)initWithName:(NSString*)name_ path:(NSString*)path_ {
     self = [super init];
     if (self) {
         templateName = [name_ retain];

diff --git a/ponso/MKCDAGNode.h b/ponso/MKCDAGNode.h
@@ -34,7 +34,7 @@
 //! All objects of nodes in topological order which are reachable from the receiver.
 @property(nonatomic, readonly) NSArray *objectsInTopologicalOrder;
 
-- (id)initWithObject:(id)object;
+- (instancetype)initWithObject:(id)object;
 
 /**
  Creates dependency between receiver and the given node and adds the given node into the DAG.

diff --git a/ponso/MKCDAGNode.m b/ponso/MKCDAGNode.m
@@ -74,7 +74,7 @@ + (void)visitNode:(MKCDAGNode *)node visitedNodes:(NSMutableSet *)visitedNodes o
 
 #pragma mark Public
 
-- (id)initWithObject:(id)anObject
+- (instancetype)initWithObject:(id)anObject
 {
 	if((self = [super init]))
 	{