From 25f3f7c03dc0c977602f0edd165a94822b8c1123 Mon Sep 17 00:00:00 2001 From: "Jeremy W. Sherman" Date: Thu, 19 Dec 2013 14:37:58 -0500 Subject: [PATCH] replaces deprecated isa with object_getClass --- UIKit/Classes/UIAction.m | 4 +++- UIKit/Classes/UIFont.m | 4 +++- UIKit/Classes/UILongPressGestureRecognizer.m | 4 +++- UIKit/Classes/UIMenuController.m | 4 +++- UIKit/Classes/UINavigationBar.m | 10 ++++++---- UIKit/Classes/UINavigationItem.m | 8 +++++--- UIKit/Classes/UIPopoverView.m | 11 +++++++---- UIKit/Classes/UIResponder.m | 4 +++- UIKit/Classes/UIView.m | 6 ++++-- 9 files changed, 37 insertions(+), 18 deletions(-) diff --git a/UIKit/Classes/UIAction.m b/UIKit/Classes/UIAction.m index 5378ff5d..8747bf48 100644 --- a/UIKit/Classes/UIAction.m +++ b/UIKit/Classes/UIAction.m @@ -28,15 +28,17 @@ */ #import "UIAction.h" +#import @implementation UIAction @synthesize target=_target, action=_action; - (BOOL)isEqual:(id)object { + Class cls = object_getClass(self); if (object == self) { return YES; - } else if ([object isKindOfClass:[isa class]]) { + } else if ([object isKindOfClass:[cls class]]) { return ([object target] == self.target && [object action] == self.action); } else { return NO; diff --git a/UIKit/Classes/UIFont.m b/UIKit/Classes/UIFont.m index dcbab16e..9095327f 100644 --- a/UIKit/Classes/UIFont.m +++ b/UIKit/Classes/UIFont.m @@ -29,6 +29,7 @@ #import "UIFont.h" #import +#import static NSString *UIFontSystemFontName = nil; static NSString *UIFontBoldSystemFontName = nil; @@ -191,7 +192,8 @@ - (UIFont *)fontWithSize:(CGFloat)fontSize { CTFontRef newFont = CTFontCreateCopyWithAttributes(_font, fontSize, NULL, NULL); if (newFont) { - UIFont *theFont = [isa _fontWithCTFont:newFont]; + Class cls = object_getClass(self); + UIFont *theFont = [cls _fontWithCTFont:newFont]; CFRelease(newFont); return theFont; } else { diff --git a/UIKit/Classes/UILongPressGestureRecognizer.m b/UIKit/Classes/UILongPressGestureRecognizer.m index 6eabf1a4..08058c15 100644 --- a/UIKit/Classes/UILongPressGestureRecognizer.m +++ b/UIKit/Classes/UILongPressGestureRecognizer.m @@ -31,6 +31,7 @@ #import "UIGestureRecognizerSubclass.h" #import "UITouch+UIPrivate.h" #import "UIEvent.h" +#import static CGFloat DistanceBetweenTwoPoints(CGPoint A, CGPoint B) { @@ -83,7 +84,8 @@ - (void)_cancelWaiting { if (_waiting) { _waiting = NO; - [isa cancelPreviousPerformRequestsWithTarget:self selector:@selector(_beginGesture) object:nil]; + Class cls = object_getClass(self); + [cls cancelPreviousPerformRequestsWithTarget:self selector:@selector(_beginGesture) object:nil]; } } diff --git a/UIKit/Classes/UIMenuController.m b/UIKit/Classes/UIMenuController.m index d5c0637c..0648c955 100644 --- a/UIKit/Classes/UIMenuController.m +++ b/UIKit/Classes/UIMenuController.m @@ -36,6 +36,7 @@ #import #import #import +#import NSString *const UIMenuControllerWillShowMenuNotification = @"UIMenuControllerWillShowMenuNotification"; NSString *const UIMenuControllerDidShowMenuNotification = @"UIMenuControllerDidShowMenuNotification"; @@ -194,7 +195,8 @@ - (void)update { UIApplication *app = [UIApplication sharedApplication]; UIResponder *firstResponder = [app.keyWindow _firstResponder]; - NSArray *allItems = [[isa _defaultMenuItems] arrayByAddingObjectsFromArray:_menuItems]; + Class cls = object_getClass(self); + NSArray *allItems = [[cls _defaultMenuItems] arrayByAddingObjectsFromArray:_menuItems]; [_enabledMenuItems removeAllObjects]; diff --git a/UIKit/Classes/UINavigationBar.m b/UIKit/Classes/UINavigationBar.m index 226deeb4..4796cb14 100644 --- a/UIKit/Classes/UINavigationBar.m +++ b/UIKit/Classes/UINavigationBar.m @@ -38,6 +38,7 @@ #import "UIImage+UIPrivate.h" #import "UIBarButtonItem.h" #import "UIButton.h" +#import static const UIEdgeInsets kButtonEdgeInsets = {0,0,0,0}; static const CGFloat kMinButtonWidth = 30; @@ -199,11 +200,12 @@ - (void)_setViewsWithTransition:(_UINavigationBarTransition)transition animated: CGRect leftFrame = CGRectZero; CGRect rightFrame = CGRectZero; - + + Class cls = object_getClass(self); if (backItem) { - _leftView = [isa _backButtonWithBarButtonItem:backItem.backBarButtonItem]; + _leftView = [cls _backButtonWithBarButtonItem:backItem.backBarButtonItem]; } else { - _leftView = [isa _viewWithBarButtonItem:topItem.leftBarButtonItem]; + _leftView = [cls _viewWithBarButtonItem:topItem.leftBarButtonItem]; } if (_leftView) { @@ -213,7 +215,7 @@ - (void)_setViewsWithTransition:(_UINavigationBarTransition)transition animated: [self addSubview:_leftView]; } - _rightView = [isa _viewWithBarButtonItem:topItem.rightBarButtonItem]; + _rightView = [cls _viewWithBarButtonItem:topItem.rightBarButtonItem]; if (_rightView) { _rightView.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin; diff --git a/UIKit/Classes/UINavigationItem.m b/UIKit/Classes/UINavigationItem.m index 13157ea2..e16894f4 100644 --- a/UIKit/Classes/UINavigationItem.m +++ b/UIKit/Classes/UINavigationItem.m @@ -32,6 +32,7 @@ #import "UINavigationItem+UIPrivate.h" #import "UINavigationBar.h" #import "UINavigationBar+UIPrivate.h" +#import static void * const UINavigationItemContext = "UINavigationItemContext"; @@ -87,16 +88,17 @@ - (void)_setNavigationBar:(UINavigationBar *)navigationBar // weak reference if (_navigationBar == navigationBar) return; - + + Class cls = object_getClass(self); if (_navigationBar != nil && navigationBar == nil) { // remove observation - for (NSString * keyPath in [isa _keyPathsTriggeringUIUpdates]) { + for (NSString * keyPath in [cls _keyPathsTriggeringUIUpdates]) { [self removeObserver:self forKeyPath:keyPath]; } } else if (navigationBar != nil) { // observe property changes to notify UI element - for (NSString * keyPath in [isa _keyPathsTriggeringUIUpdates]) { + for (NSString * keyPath in [cls _keyPathsTriggeringUIUpdates]) { [self addObserver:self forKeyPath:keyPath options:NSKeyValueObservingOptionNew context:UINavigationItemContext]; } } diff --git a/UIKit/Classes/UIPopoverView.m b/UIKit/Classes/UIPopoverView.m index c10444a7..a0d02bce 100644 --- a/UIKit/Classes/UIPopoverView.m +++ b/UIKit/Classes/UIPopoverView.m @@ -31,6 +31,7 @@ #import "UIImageView.h" #import "UIImage+UIPrivate.h" #import +#import typedef struct { CGPoint from; @@ -163,9 +164,10 @@ - (void)layoutSubviews { [super layoutSubviews]; - const CGRect bounds = self.bounds; - _backgroundView.frame = [isa backgroundRectForBounds:bounds]; - _contentContainerView.frame = [isa contentRectForBounds:bounds withNavigationBar:NO]; + const CGRect bounds = self.bounds; + Class cls = object_getClass(self); + _backgroundView.frame = [cls backgroundRectForBounds:bounds]; + _contentContainerView.frame = [cls contentRectForBounds:bounds withNavigationBar:NO]; _contentView.frame = _contentContainerView.bounds; } @@ -312,7 +314,8 @@ - (void)setContentView:(UIView *)aView - (void)setContentSize:(CGSize)aSize animated:(BOOL)animated { CGRect frame = self.frame; - frame.size = [isa frameSizeForContentSize:aSize withNavigationBar:NO]; + Class cls = object_getClass(self); + frame.size = [cls frameSizeForContentSize:aSize withNavigationBar:NO]; [UIView animateWithDuration:animated? 0.2 : 0 animations:^(void) { diff --git a/UIKit/Classes/UIResponder.m b/UIKit/Classes/UIResponder.m index 55ece95e..8961a9e5 100644 --- a/UIKit/Classes/UIResponder.m +++ b/UIKit/Classes/UIResponder.m @@ -30,6 +30,7 @@ #import "UIResponder.h" #import "UIWindow+UIPrivate.h" #import "UIInputController.h" +#import @implementation UIResponder @@ -114,7 +115,8 @@ - (BOOL)resignFirstResponder - (BOOL)canPerformAction:(SEL)action withSender:(id)sender { - if ([isa instancesRespondToSelector:action]) { + Class cls = object_getClass(self); + if ([cls instancesRespondToSelector:action]) { return YES; } else { return [[self nextResponder] canPerformAction:action withSender:sender]; diff --git a/UIKit/Classes/UIView.m b/UIKit/Classes/UIView.m index 844cc39b..6c4ca4d6 100644 --- a/UIKit/Classes/UIView.m +++ b/UIKit/Classes/UIView.m @@ -42,6 +42,7 @@ #import "UIColor+UIPrivate.h" #import "UIColorRep.h" #import +#import NSString *const UIViewFrameDidChangeNotification = @"UIViewFrameDidChangeNotification"; NSString *const UIViewBoundsDidChangeNotification = @"UIViewBoundsDidChangeNotification"; @@ -81,14 +82,15 @@ - (id)init - (id)initWithFrame:(CGRect)theFrame { if ((self=[super init])) { - _implementsDrawRect = [isa _instanceImplementsDrawRect]; + Class cls = object_getClass(self); + _implementsDrawRect = [cls _instanceImplementsDrawRect]; _clearsContextBeforeDrawing = YES; _autoresizesSubviews = YES; _userInteractionEnabled = YES; _subviews = [[NSMutableSet alloc] init]; _gestureRecognizers = [[NSMutableSet alloc] init]; - _layer = [[[isa layerClass] alloc] init]; + _layer = [[[cls layerClass] alloc] init]; _layer.delegate = self; _layer.layoutManager = [UIViewLayoutManager layoutManager];