From 108b79a3119acdcb2debb48142bd2e0217d5144a Mon Sep 17 00:00:00 2001 From: Roman Efimov Date: Wed, 14 Aug 2013 10:14:38 -0500 Subject: [PATCH] Move away from id to instancetype in item convenience methods --- RETableViewManager/RETableViewItem.h | 8 ++++---- RETableViewManager/RETableViewItem.m | 8 ++++---- RETableViewManager/RETableViewOptionsController.m | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/RETableViewManager/RETableViewItem.h b/RETableViewManager/RETableViewItem.h index a5725b9..869e343 100644 --- a/RETableViewManager/RETableViewItem.h +++ b/RETableViewManager/RETableViewItem.h @@ -54,10 +54,10 @@ @property (assign, readwrite, nonatomic) CGFloat cellHeight; @property (copy, readwrite, nonatomic) NSString *cellIdentifier; -+ (id)item; -+ (id)itemWithTitle:(NSString *)title; -+ (id)itemWithTitle:(NSString *)title accessoryType:(UITableViewCellAccessoryType)accessoryType selectionHandler:(void(^)(RETableViewItem *item))selectionHandler; -+ (id)itemWithTitle:(NSString *)title accessoryType:(UITableViewCellAccessoryType)accessoryType selectionHandler:(void(^)(RETableViewItem *item))selectionHandler accessoryButtonTapHandler:(void(^)(RETableViewItem *item))accessoryButtonTapHandler; ++ (instancetype)item; ++ (instancetype)itemWithTitle:(NSString *)title; ++ (instancetype)itemWithTitle:(NSString *)title accessoryType:(UITableViewCellAccessoryType)accessoryType selectionHandler:(void(^)(RETableViewItem *item))selectionHandler; ++ (instancetype)itemWithTitle:(NSString *)title accessoryType:(UITableViewCellAccessoryType)accessoryType selectionHandler:(void(^)(RETableViewItem *item))selectionHandler accessoryButtonTapHandler:(void(^)(RETableViewItem *item))accessoryButtonTapHandler; - (id)initWithTitle:(NSString *)title; - (id)initWithTitle:(NSString *)title accessoryType:(UITableViewCellAccessoryType)accessoryType selectionHandler:(void(^)(RETableViewItem *item))selectionHandler; diff --git a/RETableViewManager/RETableViewItem.m b/RETableViewManager/RETableViewItem.m index 04b075b..19158e4 100644 --- a/RETableViewManager/RETableViewItem.m +++ b/RETableViewManager/RETableViewItem.m @@ -29,22 +29,22 @@ @implementation RETableViewItem -+ (id)item ++ (instancetype)item { return [[self alloc] init]; } -+ (id)itemWithTitle:(NSString *)title ++ (instancetype)itemWithTitle:(NSString *)title { return [[self alloc] initWithTitle:title]; } -+ (id)itemWithTitle:(NSString *)title accessoryType:(UITableViewCellAccessoryType)accessoryType selectionHandler:(void(^)(RETableViewItem *item))selectionHandler ++ (instancetype)itemWithTitle:(NSString *)title accessoryType:(UITableViewCellAccessoryType)accessoryType selectionHandler:(void(^)(RETableViewItem *item))selectionHandler { return [[self alloc] initWithTitle:title accessoryType:accessoryType selectionHandler:selectionHandler accessoryButtonTapHandler:nil]; } -+ (id)itemWithTitle:(NSString *)title accessoryType:(UITableViewCellAccessoryType)accessoryType selectionHandler:(void(^)(RETableViewItem *item))selectionHandler accessoryButtonTapHandler:(void(^)(RETableViewItem *item))accessoryButtonTapHandler ++ (instancetype)itemWithTitle:(NSString *)title accessoryType:(UITableViewCellAccessoryType)accessoryType selectionHandler:(void(^)(RETableViewItem *item))selectionHandler accessoryButtonTapHandler:(void(^)(RETableViewItem *item))accessoryButtonTapHandler { return [[self alloc] initWithTitle:title accessoryType:accessoryType selectionHandler:selectionHandler accessoryButtonTapHandler:accessoryButtonTapHandler]; } diff --git a/RETableViewManager/RETableViewOptionsController.m b/RETableViewManager/RETableViewOptionsController.m index bc2b7b3..279376b 100644 --- a/RETableViewManager/RETableViewOptionsController.m +++ b/RETableViewManager/RETableViewOptionsController.m @@ -118,7 +118,7 @@ }; for (RETableViewItem *item in self.options) { - addItem([item isKindOfClass:[RERadioItem item]] ? item.title : (NSString *)item); + addItem([item isKindOfClass:[[RERadioItem item] class]] ? item.title : (NSString *)item); } }