From 61bcb58858e15eb26d79def3c786c00ed8ecdd72 Mon Sep 17 00:00:00 2001 From: Jonathan Willing Date: Sun, 26 Jan 2014 15:05:44 -0600 Subject: [PATCH] don't use the deprecated initializer in included layouts --- JNWCollectionView/JNWCollectionViewGridLayout.m | 4 ++-- JNWCollectionView/JNWCollectionViewListLayout.m | 4 ++-- JNWCollectionViewTests/JNWCollectionViewSpec.m | 4 ++-- JNWCollectionViewTests/JNWTestImplementation.m | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/JNWCollectionView/JNWCollectionViewGridLayout.m b/JNWCollectionView/JNWCollectionViewGridLayout.m index 397262f..b65fa61 100644 --- a/JNWCollectionView/JNWCollectionViewGridLayout.m +++ b/JNWCollectionView/JNWCollectionViewGridLayout.m @@ -68,8 +68,8 @@ @interface JNWCollectionViewGridLayout() @implementation JNWCollectionViewGridLayout -- (instancetype)initWithCollectionView:(JNWCollectionView *)collectionView { - self = [super initWithCollectionView:collectionView]; +- (instancetype)init { + self = [super init]; if (self == nil) return nil; self.itemSize = JNWCollectionViewGridLayoutDefaultSize; return self; diff --git a/JNWCollectionView/JNWCollectionViewListLayout.m b/JNWCollectionView/JNWCollectionViewListLayout.m index 1d72832..a73d748 100644 --- a/JNWCollectionView/JNWCollectionViewListLayout.m +++ b/JNWCollectionView/JNWCollectionViewListLayout.m @@ -67,8 +67,8 @@ @interface JNWCollectionViewListLayout() @implementation JNWCollectionViewListLayout -- (instancetype)initWithCollectionView:(JNWCollectionView *)collectionView { - self = [super initWithCollectionView:collectionView]; +- (instancetype)init { + self = [super init]; if (self == nil) return nil; self.rowHeight = 44.f; return self; diff --git a/JNWCollectionViewTests/JNWCollectionViewSpec.m b/JNWCollectionViewTests/JNWCollectionViewSpec.m index 46e84ca..6f9c560 100644 --- a/JNWCollectionViewTests/JNWCollectionViewSpec.m +++ b/JNWCollectionViewTests/JNWCollectionViewSpec.m @@ -41,7 +41,7 @@ beforeAll(^{ collectionView = [[JNWCollectionView alloc] initWithFrame:CGRectMake(0, 0, 400, 400)]; - collectionViewLayout = [[JNWCollectionViewLayout alloc] initWithCollectionView:collectionView]; + collectionViewLayout = [[JNWCollectionViewLayout alloc] init]; collectionView.collectionViewLayout = collectionViewLayout; testDataSource = [[JNWTestDataSource alloc] init]; collectionView.dataSource = testDataSource; @@ -82,7 +82,7 @@ beforeAll(^{ collectionView = [[JNWCollectionView alloc] initWithFrame:CGRectMake(0, 0, 300, 500)]; - collectionViewLayout = [[JNWCollectionViewLayout alloc] initWithCollectionView:collectionView]; + collectionViewLayout = [[JNWCollectionViewLayout alloc] init]; collectionView.collectionViewLayout = collectionViewLayout; dataSource = [[JNWTestDataSource alloc] init]; collectionView.dataSource = dataSource; diff --git a/JNWCollectionViewTests/JNWTestImplementation.m b/JNWCollectionViewTests/JNWTestImplementation.m index dad043d..b4886d1 100644 --- a/JNWCollectionViewTests/JNWTestImplementation.m +++ b/JNWCollectionViewTests/JNWTestImplementation.m @@ -42,7 +42,7 @@ - (NSInteger)numberOfSectionsInCollectionView:(JNWCollectionView *)collectionVie } - (JNWCollectionViewReusableView *)collectionView:(JNWCollectionView *)collectionView viewForSupplementaryViewOfKind:(NSString *)kind inSection:(NSInteger)section { - if ([kind isEqualToString:JNWCollectionViewListLayoutHeaderIdentifier]) { + if ([kind isEqualToString:JNWCollectionViewListLayoutHeaderKind]) { JNWCollectionViewReusableView *header = [collectionView dequeueReusableSupplementaryViewOfKind:kind withReuseIdentifer:kTestDataSourceHeaderIdentifier]; return header; } else {