From ce869235bc73b0d06bb57d47966d052d8073e2ed Mon Sep 17 00:00:00 2001 From: Petro Rovenskyy Date: Mon, 4 Jul 2016 21:50:17 +0300 Subject: [PATCH] Refactored '-(id)init' to '- (instancetype)init' --- XLForm/XL/Cell/XLFormBaseCell.m | 2 +- XLForm/XL/Cell/XLFormButtonCell.m | 2 +- XLForm/XL/Cell/XLFormStepCounterCell.m | 2 +- XLForm/XL/Controllers/XLFormOptionsObject.m | 4 ++-- XLForm/XL/Controllers/XLFormOptionsViewController.h | 4 ++-- XLForm/XL/Controllers/XLFormOptionsViewController.m | 4 ++-- XLForm/XL/Controllers/XLFormViewController.m | 4 ++-- XLForm/XL/Descriptors/XLFormRowDescriptor.m | 2 +- XLForm/XL/Helpers/Views/XLFormRightDetailCell.m | 2 +- XLForm/XL/Helpers/Views/XLFormRowNavigationAccessoryView.m | 2 +- XLForm/XL/Helpers/Views/XLFormTextView.m | 2 +- XLForm/XL/Validation/XLFormRegexValidator.h | 2 +- XLForm/XL/Validation/XLFormRegexValidator.m | 2 +- XLForm/XL/Validation/XLFormValidationStatus.h | 4 ++-- XLForm/XL/Validation/XLFormValidationStatus.m | 4 ++-- 15 files changed, 21 insertions(+), 21 deletions(-) diff --git a/XLForm/XL/Cell/XLFormBaseCell.m b/XLForm/XL/Cell/XLFormBaseCell.m index 8f149b3..5d99ba0 100644 --- a/XLForm/XL/Cell/XLFormBaseCell.m +++ b/XLForm/XL/Cell/XLFormBaseCell.m @@ -27,7 +27,7 @@ @implementation XLFormBaseCell -- (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier +- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]; if (self) { diff --git a/XLForm/XL/Cell/XLFormButtonCell.m b/XLForm/XL/Cell/XLFormButtonCell.m index 11fdff5..aaf6a3f 100644 --- a/XLForm/XL/Cell/XLFormButtonCell.m +++ b/XLForm/XL/Cell/XLFormButtonCell.m @@ -28,7 +28,7 @@ @implementation XLFormButtonCell -- (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier +- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { return [super initWithStyle:style reuseIdentifier:reuseIdentifier]; } diff --git a/XLForm/XL/Cell/XLFormStepCounterCell.m b/XLForm/XL/Cell/XLFormStepCounterCell.m index 5a4ea0d..ea53003 100644 --- a/XLForm/XL/Cell/XLFormStepCounterCell.m +++ b/XLForm/XL/Cell/XLFormStepCounterCell.m @@ -40,7 +40,7 @@ #pragma mark - XLFormStepCounterCell -- (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { +- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]; if (self) { // Initialization code diff --git a/XLForm/XL/Controllers/XLFormOptionsObject.m b/XLForm/XL/Controllers/XLFormOptionsObject.m index b6a0a67..a72df7a 100644 --- a/XLForm/XL/Controllers/XLFormOptionsObject.m +++ b/XLForm/XL/Controllers/XLFormOptionsObject.m @@ -36,7 +36,7 @@ return [[XLFormOptionsObject alloc] initWithValue:value displayText:displayText]; } --(id)initWithValue:(id)value displayText:(NSString *)displayText +-(instancetype)initWithValue:(id)value displayText:(NSString *)displayText { self = [super init]; if (self){ @@ -94,7 +94,7 @@ [encoder encodeObject:self.formDisplayText forKey:@"formDisplayText"]; } --(id)initWithCoder:(NSCoder *)decoder +-(instancetype)initWithCoder:(NSCoder *)decoder { if ((self=[super init])) { diff --git a/XLForm/XL/Controllers/XLFormOptionsViewController.h b/XLForm/XL/Controllers/XLFormOptionsViewController.h index 66b03eb..a072404 100644 --- a/XLForm/XL/Controllers/XLFormOptionsViewController.h +++ b/XLForm/XL/Controllers/XLFormOptionsViewController.h @@ -30,10 +30,10 @@ @interface XLFormOptionsViewController : UITableViewController -- (id)initWithStyle:(UITableViewStyle)style; +- (instancetype)initWithStyle:(UITableViewStyle)style; -- (id)initWithStyle:(UITableViewStyle)style +- (instancetype)initWithStyle:(UITableViewStyle)style titleHeaderSection:(NSString *)titleHeaderSection titleFooterSection:(NSString *)titleFooterSection; diff --git a/XLForm/XL/Controllers/XLFormOptionsViewController.m b/XLForm/XL/Controllers/XLFormOptionsViewController.m index 3404a9e..9c539d4 100644 --- a/XLForm/XL/Controllers/XLFormOptionsViewController.m +++ b/XLForm/XL/Controllers/XLFormOptionsViewController.m @@ -47,7 +47,7 @@ @synthesize rowDescriptor = _rowDescriptor; @synthesize popoverController = __popoverController; -- (id)initWithStyle:(UITableViewStyle)style +- (instancetype)initWithStyle:(UITableViewStyle)style { self = [super initWithStyle:style]; if (self){ @@ -57,7 +57,7 @@ return self; } -- (id)initWithStyle:(UITableViewStyle)style titleHeaderSection:(NSString *)titleHeaderSection titleFooterSection:(NSString *)titleFooterSection +- (instancetype)initWithStyle:(UITableViewStyle)style titleHeaderSection:(NSString *)titleHeaderSection titleFooterSection:(NSString *)titleFooterSection { self = [self initWithStyle:style]; if (self){ diff --git a/XLForm/XL/Controllers/XLFormViewController.m b/XLForm/XL/Controllers/XLFormViewController.m index e08d6cf..74df82d 100755 --- a/XLForm/XL/Controllers/XLFormViewController.m +++ b/XLForm/XL/Controllers/XLFormViewController.m @@ -68,12 +68,12 @@ #pragma mark - Initialization --(id)initWithForm:(XLFormDescriptor *)form +-(instancetype)initWithForm:(XLFormDescriptor *)form { return [self initWithForm:form style:UITableViewStyleGrouped]; } --(id)initWithForm:(XLFormDescriptor *)form style:(UITableViewStyle)style +-(instancetype)initWithForm:(XLFormDescriptor *)form style:(UITableViewStyle)style { self = [self initWithNibName:nil bundle:nil]; if (self){ diff --git a/XLForm/XL/Descriptors/XLFormRowDescriptor.m b/XLForm/XL/Descriptors/XLFormRowDescriptor.m index e0670bc..4d4b78b 100644 --- a/XLForm/XL/Descriptors/XLFormRowDescriptor.m +++ b/XLForm/XL/Descriptors/XLFormRowDescriptor.m @@ -580,7 +580,7 @@ CGFloat XLFormRowInitialHeight = -2; } --(id)initWithLeftValue:(NSString *)leftValue httpParameterKey:(NSString *)httpParameterKey rightOptions:(NSArray *)rightOptions +-(instancetype)initWithLeftValue:(NSString *)leftValue httpParameterKey:(NSString *)httpParameterKey rightOptions:(NSArray *)rightOptions { self = [super init]; if (self){ diff --git a/XLForm/XL/Helpers/Views/XLFormRightDetailCell.m b/XLForm/XL/Helpers/Views/XLFormRightDetailCell.m index ecb200a..a6bb36c 100644 --- a/XLForm/XL/Helpers/Views/XLFormRightDetailCell.m +++ b/XLForm/XL/Helpers/Views/XLFormRightDetailCell.m @@ -27,7 +27,7 @@ @implementation XLFormRightDetailCell -- (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier +- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { return [super initWithStyle:UITableViewCellStyleValue1 reuseIdentifier:reuseIdentifier]; } diff --git a/XLForm/XL/Helpers/Views/XLFormRowNavigationAccessoryView.m b/XLForm/XL/Helpers/Views/XLFormRowNavigationAccessoryView.m index 74da951..f769a5b 100755 --- a/XLForm/XL/Helpers/Views/XLFormRowNavigationAccessoryView.m +++ b/XLForm/XL/Helpers/Views/XLFormRowNavigationAccessoryView.m @@ -40,7 +40,7 @@ @synthesize doneButton = _doneButton; -- (id)initWithFrame:(CGRect)frame +- (instancetype)initWithFrame:(CGRect)frame { self = [super initWithFrame:CGRectMake(0, 0, [UIScreen mainScreen].bounds.size.width, 44.0)]; if (self) { diff --git a/XLForm/XL/Helpers/Views/XLFormTextView.m b/XLForm/XL/Helpers/Views/XLFormTextView.m index a9c27d6..b95ab99 100644 --- a/XLForm/XL/Helpers/Views/XLFormTextView.m +++ b/XLForm/XL/Helpers/Views/XLFormTextView.m @@ -33,7 +33,7 @@ [[NSNotificationCenter defaultCenter] removeObserver:self]; } -- (id)initWithFrame:(CGRect)frame +- (instancetype)initWithFrame:(CGRect)frame { if((self = [super initWithFrame:frame])){ self.scrollsToTop = NO; diff --git a/XLForm/XL/Validation/XLFormRegexValidator.h b/XLForm/XL/Validation/XLFormRegexValidator.h index f8d714d..f2cc95b 100644 --- a/XLForm/XL/Validation/XLFormRegexValidator.h +++ b/XLForm/XL/Validation/XLFormRegexValidator.h @@ -32,7 +32,7 @@ @property NSString *msg; @property NSString *regex; -- (id)initWithMsg:(NSString*)msg andRegexString:(NSString*)regex; +- (instancetype)initWithMsg:(NSString*)msg andRegexString:(NSString*)regex; + (XLFormRegexValidator *)formRegexValidatorWithMsg:(NSString *)msg regex:(NSString *)regex; @end diff --git a/XLForm/XL/Validation/XLFormRegexValidator.m b/XLForm/XL/Validation/XLFormRegexValidator.m index fcce3ba..ab7880f 100644 --- a/XLForm/XL/Validation/XLFormRegexValidator.m +++ b/XLForm/XL/Validation/XLFormRegexValidator.m @@ -27,7 +27,7 @@ @implementation XLFormRegexValidator --(id)initWithMsg:(NSString*)msg andRegexString:(NSString*)regex { +-(instancetype)initWithMsg:(NSString*)msg andRegexString:(NSString*)regex { self = [super init]; if (self) { self.msg = msg; diff --git a/XLForm/XL/Validation/XLFormValidationStatus.h b/XLForm/XL/Validation/XLFormValidationStatus.h index e88da3a..78fd827 100644 --- a/XLForm/XL/Validation/XLFormValidationStatus.h +++ b/XLForm/XL/Validation/XLFormValidationStatus.h @@ -33,8 +33,8 @@ @property BOOL isValid; @property (nonatomic, weak) XLFormRowDescriptor *rowDescriptor; -//-(id)initWithMsg:(NSString*)msg andStatus:(BOOL)isValid; --(id)initWithMsg:(NSString*)msg status:(BOOL)isValid rowDescriptor:(XLFormRowDescriptor *)row; +//-(instancetype)initWithMsg:(NSString*)msg andStatus:(BOOL)isValid; +-(instancetype)initWithMsg:(NSString*)msg status:(BOOL)isValid rowDescriptor:(XLFormRowDescriptor *)row; //+(XLFormValidationStatus *)formValidationStatusWithMsg:(NSString *)msg status:(BOOL)status; +(XLFormValidationStatus *)formValidationStatusWithMsg:(NSString *)msg status:(BOOL)status rowDescriptor:(XLFormRowDescriptor *)row; diff --git a/XLForm/XL/Validation/XLFormValidationStatus.m b/XLForm/XL/Validation/XLFormValidationStatus.m index 2a94b91..a636275 100644 --- a/XLForm/XL/Validation/XLFormValidationStatus.m +++ b/XLForm/XL/Validation/XLFormValidationStatus.m @@ -27,11 +27,11 @@ @implementation XLFormValidationStatus --(id)initWithMsg:(NSString*)msg andStatus:(BOOL)isValid { +-(instancetype)initWithMsg:(NSString*)msg andStatus:(BOOL)isValid { return [self initWithMsg:msg status:isValid rowDescriptor:nil]; } --(id)initWithMsg:(NSString*)msg status:(BOOL)isValid rowDescriptor:(XLFormRowDescriptor *)row { +-(instancetype)initWithMsg:(NSString*)msg status:(BOOL)isValid rowDescriptor:(XLFormRowDescriptor *)row { self = [super init]; if (self) { self.msg = msg;