From 527397ba7e8e25fb5fcdbe2c0f190fab75c1c675 Mon Sep 17 00:00:00 2001 From: Eric Jensen Date: Wed, 13 Apr 2016 11:20:05 -0700 Subject: [PATCH] Replace id with instancetype in initializers --- AsyncDisplayKit/ASControlNode.mm | 2 +- AsyncDisplayKit/ASDisplayNode.mm | 14 +++++++------- AsyncDisplayKit/ASImageNode.mm | 14 +++++++------- AsyncDisplayKit/Details/ASHighlightOverlayLayer.h | 4 ++-- AsyncDisplayKit/Details/ASHighlightOverlayLayer.mm | 4 ++-- .../Details/Transactions/_ASAsyncTransaction.h | 4 ++-- .../Details/Transactions/_ASAsyncTransaction.mm | 8 ++++---- .../Transactions/_ASAsyncTransactionGroup.m | 2 +- AsyncDisplayKit/Details/_ASDisplayLayer.mm | 2 +- AsyncDisplayKit/Details/_ASDisplayView.mm | 4 ++-- AsyncDisplayKit/Private/ASDisplayNodeInternal.h | 4 ++-- AsyncDisplayKit/Private/_ASPendingState.mm | 2 +- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/AsyncDisplayKit/ASControlNode.mm b/AsyncDisplayKit/ASControlNode.mm index 1952b71ced..afca48a486 100644 --- a/AsyncDisplayKit/ASControlNode.mm +++ b/AsyncDisplayKit/ASControlNode.mm @@ -80,7 +80,7 @@ static BOOL _enableHitTestDebug = NO; #pragma mark - Lifecycle -- (id)init +- (instancetype)init { if (!(self = [super init])) return nil; diff --git a/AsyncDisplayKit/ASDisplayNode.mm b/AsyncDisplayKit/ASDisplayNode.mm index cf4c820f2a..871370d789 100644 --- a/AsyncDisplayKit/ASDisplayNode.mm +++ b/AsyncDisplayKit/ASDisplayNode.mm @@ -256,7 +256,7 @@ static ASDisplayNodeMethodOverrides GetASDisplayNodeMethodOverrides(Class c) _environmentState = ASEnvironmentStateMakeDefault(); } -- (id)init +- (instancetype)init { if (!(self = [super init])) return nil; @@ -266,7 +266,7 @@ static ASDisplayNodeMethodOverrides GetASDisplayNodeMethodOverrides(Class c) return self; } -- (id)initWithViewClass:(Class)viewClass +- (instancetype)initWithViewClass:(Class)viewClass { if (!(self = [super init])) return nil; @@ -280,7 +280,7 @@ static ASDisplayNodeMethodOverrides GetASDisplayNodeMethodOverrides(Class c) return self; } -- (id)initWithLayerClass:(Class)layerClass +- (instancetype)initWithLayerClass:(Class)layerClass { if (!(self = [super init])) return nil; @@ -295,12 +295,12 @@ static ASDisplayNodeMethodOverrides GetASDisplayNodeMethodOverrides(Class c) return self; } -- (id)initWithViewBlock:(ASDisplayNodeViewBlock)viewBlock +- (instancetype)initWithViewBlock:(ASDisplayNodeViewBlock)viewBlock { return [self initWithViewBlock:viewBlock didLoadBlock:nil]; } -- (id)initWithViewBlock:(ASDisplayNodeViewBlock)viewBlock didLoadBlock:(ASDisplayNodeDidLoadBlock)didLoadBlock +- (instancetype)initWithViewBlock:(ASDisplayNodeViewBlock)viewBlock didLoadBlock:(ASDisplayNodeDidLoadBlock)didLoadBlock { if (!(self = [super init])) return nil; @@ -315,12 +315,12 @@ static ASDisplayNodeMethodOverrides GetASDisplayNodeMethodOverrides(Class c) return self; } -- (id)initWithLayerBlock:(ASDisplayNodeLayerBlock)layerBlock +- (instancetype)initWithLayerBlock:(ASDisplayNodeLayerBlock)layerBlock { return [self initWithLayerBlock:layerBlock didLoadBlock:nil]; } -- (id)initWithLayerBlock:(ASDisplayNodeLayerBlock)layerBlock didLoadBlock:(ASDisplayNodeDidLoadBlock)didLoadBlock +- (instancetype)initWithLayerBlock:(ASDisplayNodeLayerBlock)layerBlock didLoadBlock:(ASDisplayNodeDidLoadBlock)didLoadBlock { if (!(self = [super init])) return nil; diff --git a/AsyncDisplayKit/ASImageNode.mm b/AsyncDisplayKit/ASImageNode.mm index 3ab12e565a..a60cef451c 100644 --- a/AsyncDisplayKit/ASImageNode.mm +++ b/AsyncDisplayKit/ASImageNode.mm @@ -37,12 +37,12 @@ // TODO: eliminate explicit parameters with a set of keys copied from the node @implementation _ASImageNodeDrawParameters -- (id)initWithImage:(UIImage *)image - bounds:(CGRect)bounds - opaque:(BOOL)opaque - contentsScale:(CGFloat)contentsScale - backgroundColor:(UIColor *)backgroundColor - contentMode:(UIViewContentMode)contentMode +- (instancetype)initWithImage:(UIImage *)image + bounds:(CGRect)bounds + opaque:(BOOL)opaque + contentsScale:(CGFloat)contentsScale + backgroundColor:(UIColor *)backgroundColor + contentMode:(UIViewContentMode)contentMode { if (!(self = [self init])) return nil; @@ -84,7 +84,7 @@ @synthesize image = _image; @synthesize imageModificationBlock = _imageModificationBlock; -- (id)init +- (instancetype)init { if (!(self = [super init])) return nil; diff --git a/AsyncDisplayKit/Details/ASHighlightOverlayLayer.h b/AsyncDisplayKit/Details/ASHighlightOverlayLayer.h index 736ff08753..6b5f7913ce 100644 --- a/AsyncDisplayKit/Details/ASHighlightOverlayLayer.h +++ b/AsyncDisplayKit/Details/ASHighlightOverlayLayer.h @@ -20,14 +20,14 @@ NS_ASSUME_NONNULL_BEGIN @param rects Array containing CGRects wrapped in NSValue. @param targetLayer The layer that the rects are relative to. The rects will be translated to the receiver's coordinate space when rendering. */ -- (id)initWithRects:(NSArray *)rects targetLayer:(nullable CALayer *)targetLayer; +- (instancetype)initWithRects:(NSArray *)rects targetLayer:(nullable CALayer *)targetLayer; /** @summary Initializes with CGRects for the highlighting, in the receiver's coordinate space. @param rects Array containing CGRects wrapped in NSValue. */ -- (id)initWithRects:(NSArray *)rects; +- (instancetype)initWithRects:(NSArray *)rects; @property (nullable, atomic, strong) __attribute__((NSObject)) CGColorRef highlightColor; @property (atomic, weak) CALayer *targetLayer; diff --git a/AsyncDisplayKit/Details/ASHighlightOverlayLayer.mm b/AsyncDisplayKit/Details/ASHighlightOverlayLayer.mm index acaa97f00e..1308fa4557 100644 --- a/AsyncDisplayKit/Details/ASHighlightOverlayLayer.mm +++ b/AsyncDisplayKit/Details/ASHighlightOverlayLayer.mm @@ -49,12 +49,12 @@ static const UIEdgeInsets padding = {2, 4, 1.5, 4}; return (id)[NSNull null]; } -- (id)initWithRects:(NSArray *)rects +- (instancetype)initWithRects:(NSArray *)rects { return [self initWithRects:rects targetLayer:nil]; } -- (id)initWithRects:(NSArray *)rects targetLayer:(id)targetLayer +- (instancetype)initWithRects:(NSArray *)rects targetLayer:(id)targetLayer { if (self = [super init]) { _rects = [rects copy]; diff --git a/AsyncDisplayKit/Details/Transactions/_ASAsyncTransaction.h b/AsyncDisplayKit/Details/Transactions/_ASAsyncTransaction.h index aa28f11f10..e26d76b98a 100644 --- a/AsyncDisplayKit/Details/Transactions/_ASAsyncTransaction.h +++ b/AsyncDisplayKit/Details/Transactions/_ASAsyncTransaction.h @@ -54,8 +54,8 @@ extern NSInteger const ASDefaultTransactionPriority; @param callbackQueue The dispatch queue that the completion blocks will be called on. @param completionBlock A block that is called when the transaction is completed. May be NULL. */ -- (id)initWithCallbackQueue:(dispatch_queue_t)callbackQueue - completionBlock:(asyncdisplaykit_async_transaction_completion_block_t)completionBlock; +- (instancetype)initWithCallbackQueue:(dispatch_queue_t)callbackQueue + completionBlock:(asyncdisplaykit_async_transaction_completion_block_t)completionBlock; /** @summary Block the main thread until the transaction is complete, including callbacks. diff --git a/AsyncDisplayKit/Details/Transactions/_ASAsyncTransaction.mm b/AsyncDisplayKit/Details/Transactions/_ASAsyncTransaction.mm index be689c624f..5869be4166 100644 --- a/AsyncDisplayKit/Details/Transactions/_ASAsyncTransaction.mm +++ b/AsyncDisplayKit/Details/Transactions/_ASAsyncTransaction.mm @@ -16,14 +16,14 @@ NSInteger const ASDefaultTransactionPriority = 0; @interface ASDisplayNodeAsyncTransactionOperation : NSObject -- (id)initWithOperationCompletionBlock:(asyncdisplaykit_async_transaction_operation_completion_block_t)operationCompletionBlock; +- (instancetype)initWithOperationCompletionBlock:(asyncdisplaykit_async_transaction_operation_completion_block_t)operationCompletionBlock; @property (nonatomic, copy) asyncdisplaykit_async_transaction_operation_completion_block_t operationCompletionBlock; @property (atomic, strong) id value; // set on bg queue by the operation block @end @implementation ASDisplayNodeAsyncTransactionOperation -- (id)initWithOperationCompletionBlock:(asyncdisplaykit_async_transaction_operation_completion_block_t)operationCompletionBlock +- (instancetype)initWithOperationCompletionBlock:(asyncdisplaykit_async_transaction_operation_completion_block_t)operationCompletionBlock { if ((self = [super init])) { _operationCompletionBlock = [operationCompletionBlock copy]; @@ -315,8 +315,8 @@ ASAsyncTransactionQueue & ASAsyncTransactionQueue::instance() #pragma mark - #pragma mark Lifecycle -- (id)initWithCallbackQueue:(dispatch_queue_t)callbackQueue - completionBlock:(void(^)(_ASAsyncTransaction *, BOOL))completionBlock +- (instancetype)initWithCallbackQueue:(dispatch_queue_t)callbackQueue + completionBlock:(void(^)(_ASAsyncTransaction *, BOOL))completionBlock { if ((self = [self init])) { if (callbackQueue == NULL) { diff --git a/AsyncDisplayKit/Details/Transactions/_ASAsyncTransactionGroup.m b/AsyncDisplayKit/Details/Transactions/_ASAsyncTransactionGroup.m index afebd4e5cc..5749ab7591 100644 --- a/AsyncDisplayKit/Details/Transactions/_ASAsyncTransactionGroup.m +++ b/AsyncDisplayKit/Details/Transactions/_ASAsyncTransactionGroup.m @@ -62,7 +62,7 @@ static void _transactionGroupRunLoopObserverCallback(CFRunLoopObserverRef observ CFRelease(observer); } -- (id)init +- (instancetype)init { if ((self = [super init])) { _containerLayers = [NSHashTable hashTableWithOptions:NSPointerFunctionsObjectPointerPersonality]; diff --git a/AsyncDisplayKit/Details/_ASDisplayLayer.mm b/AsyncDisplayKit/Details/_ASDisplayLayer.mm index 9b5246f587..e7316e8bd0 100644 --- a/AsyncDisplayKit/Details/_ASDisplayLayer.mm +++ b/AsyncDisplayKit/Details/_ASDisplayLayer.mm @@ -31,7 +31,7 @@ #pragma mark - #pragma mark Lifecycle -- (id)init +- (instancetype)init { if ((self = [super init])) { _displaySentinel = [[ASSentinel alloc] init]; diff --git a/AsyncDisplayKit/Details/_ASDisplayView.mm b/AsyncDisplayKit/Details/_ASDisplayView.mm index acd796eeab..5c96f43ff2 100644 --- a/AsyncDisplayKit/Details/_ASDisplayView.mm +++ b/AsyncDisplayKit/Details/_ASDisplayView.mm @@ -37,7 +37,7 @@ } #pragma mark - NSObject Overrides -- (id)init +- (instancetype)init { return [self initWithFrame:CGRectZero]; } @@ -51,7 +51,7 @@ #pragma mark - UIView Overrides -- (id)initWithFrame:(CGRect)frame +- (instancetype)initWithFrame:(CGRect)frame { if (!(self = [super initWithFrame:frame])) return nil; diff --git a/AsyncDisplayKit/Private/ASDisplayNodeInternal.h b/AsyncDisplayKit/Private/ASDisplayNodeInternal.h index 878d921eec..20f169cf46 100644 --- a/AsyncDisplayKit/Private/ASDisplayNodeInternal.h +++ b/AsyncDisplayKit/Private/ASDisplayNodeInternal.h @@ -196,10 +196,10 @@ FOUNDATION_EXPORT NSString * const ASRenderingEngineDidDisplayNodesScheduledBefo - (void)displayImmediately; // Alternative initialiser for backing with a custom view class. Supports asynchronous display with _ASDisplayView subclasses. -- (id)initWithViewClass:(Class)viewClass; +- (instancetype)initWithViewClass:(Class)viewClass; // Alternative initialiser for backing with a custom layer class. Supports asynchronous display with _ASDisplayLayer subclasses. -- (id)initWithLayerClass:(Class)layerClass; +- (instancetype)initWithLayerClass:(Class)layerClass; @property (nonatomic, assign) CGFloat contentsScaleForDisplay; diff --git a/AsyncDisplayKit/Private/_ASPendingState.mm b/AsyncDisplayKit/Private/_ASPendingState.mm index 643728f64f..b85cbb57c3 100644 --- a/AsyncDisplayKit/Private/_ASPendingState.mm +++ b/AsyncDisplayKit/Private/_ASPendingState.mm @@ -179,7 +179,7 @@ ASDISPLAYNODE_INLINE void ASPendingStateApplyMetricsToLayer(_ASPendingState *sta static CGColorRef blackColorRef = NULL; static UIColor *defaultTintColor = nil; -- (id)init +- (instancetype)init { if (!(self = [super init])) return nil;