Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Added __unsafe_unretained on delegate ivars.

I don't know if this is necessary or not, but it seems like a good
annotation just for humans, if anything, and could make it easier to
switch them all to __weak sometime later which is probably what they
should be if it weren't for 10.6 not supporting it...
  • Loading branch information...
commit 2db957d404e089fb1e719045921e69aecc3d5b36 1 parent 278e8cf
@BigZaphod authored
Showing with 29 additions and 29 deletions.
  1. +1 −1  MessageUI/Classes/MFMailComposeViewController.h
  2. +1 −1  MessageUI/MFMessageComposeViewController.h
  3. +1 −1  StoreKit/Classes/SKRequest.h
  4. +1 −1  UIKit/Classes/NSFetchedResultsController.h
  5. +1 −1  UIKit/Classes/UIAccelerometer.h
  6. +1 −1  UIKit/Classes/UIAction.h
  7. +1 −1  UIKit/Classes/UIActionSheet.h
  8. +1 −1  UIKit/Classes/UIAlertView.h
  9. +1 −1  UIKit/Classes/UIApplication.h
  10. +1 −1  UIKit/Classes/UIBarButtonItem.h
  11. +1 −1  UIKit/Classes/UIGestureRecognizer.h
  12. +1 −1  UIKit/Classes/UINavigationBar.h
  13. +1 −1  UIKit/Classes/UINavigationController.h
  14. +2 −2 UIKit/Classes/UIPickerView.h
  15. +1 −1  UIKit/Classes/UIPopoverController.h
  16. +1 −1  UIKit/Classes/UIScrollView.h
  17. +1 −1  UIKit/Classes/UIScroller.h
  18. +1 −1  UIKit/Classes/UISearchBar.h
  19. +3 −3 UIKit/Classes/UISearchDisplayController.h
  20. +1 −1  UIKit/Classes/UISplitViewController.h
  21. +1 −1  UIKit/Classes/UITabBar.h
  22. +1 −1  UIKit/Classes/UITabBarController.h
  23. +1 −1  UIKit/Classes/UITableView.h
  24. +1 −1  UIKit/Classes/UITextField.h
  25. +1 −1  UIKit/Classes/UITransitionView.h
  26. +1 −1  UIKit/Classes/UIWebView.h
View
2  MessageUI/Classes/MFMailComposeViewController.h
@@ -46,7 +46,7 @@ typedef enum MFMailComposeResult MFMailComposeResult;
@interface MFMailComposeViewController : UINavigationController {
@private
- id<MFMailComposeViewControllerDelegate> _mailComposeDelegate;
+ __unsafe_unretained id<MFMailComposeViewControllerDelegate> _mailComposeDelegate;
}
+ (BOOL)canSendMail;
View
2  MessageUI/MFMessageComposeViewController.h
@@ -43,7 +43,7 @@ enum MessageComposeResult {
typedef enum MessageComposeResult MessageComposeResult;
@interface MFMessageComposeViewController : NSObject {
- id<MFMessageComposeViewControllerDelegate> _messageComposeDelegate;
+ __unsafe_unretained id<MFMessageComposeViewControllerDelegate> _messageComposeDelegate;
NSArray *_recipients;
NSString *_body;
}
View
2  StoreKit/Classes/SKRequest.h
@@ -34,7 +34,7 @@
@interface SKRequest : NSObject {
@private
- id<SKRequestDelegate> _delegate;
+ __unsafe_unretained id<SKRequestDelegate> _delegate;
}
@property(nonatomic, assign) id<SKRequestDelegate> delegate;
View
2  UIKit/Classes/NSFetchedResultsController.h
@@ -45,7 +45,7 @@
@interface NSFetchedResultsController : NSObject {
- id <NSFetchedResultsControllerDelegate> _delegate;
+ __unsafe_unretained id <NSFetchedResultsControllerDelegate> _delegate;
NSFetchRequest *_fetchRequest;
NSManagedObjectContext *_managedObjectContext;
NSArray *_fetchedObjects; // we don't yet support sections!
View
2  UIKit/Classes/UIAccelerometer.h
@@ -38,7 +38,7 @@
@interface UIAccelerometer : NSObject {
@private
NSTimeInterval _updateInterval;
- id<UIAccelerometerDelegate> _delegate;
+ __unsafe_unretained id<UIAccelerometerDelegate> _delegate;
}
+ (UIAccelerometer *)sharedAccelerometer;
View
2  UIKit/Classes/UIAction.h
@@ -30,7 +30,7 @@
#import <Foundation/Foundation.h>
@interface UIAction : NSObject {
- id _target;
+ __unsafe_unretained id _target;
SEL _action;
}
View
2  UIKit/Classes/UIActionSheet.h
@@ -51,7 +51,7 @@ typedef enum {
@interface UIActionSheet : UIView {
@private
- id<UIActionSheetDelegate> _delegate;
+ __unsafe_unretained id<UIActionSheetDelegate> _delegate;
NSInteger _destructiveButtonIndex;
NSInteger _cancelButtonIndex;
NSInteger _firstOtherButtonIndex;
View
2  UIKit/Classes/UIAlertView.h
@@ -35,7 +35,7 @@
@private
NSString *_title;
NSString *_message;
- id<UIAlertViewDelegate> _delegate;
+ __unsafe_unretained id<UIAlertViewDelegate> _delegate;
NSInteger _cancelButtonIndex;
NSMutableArray *_buttonTitles;
View
2  UIKit/Classes/UIApplication.h
@@ -99,7 +99,7 @@ extern const NSTimeInterval UIMinimumKeepAliveTimeout;
UIEvent *_currentEvent;
UIWindow *_keyWindow;
NSMutableSet *_visibleWindows;
- id<UIApplicationDelegate> _delegate;
+ __unsafe_unretained id<UIApplicationDelegate> _delegate;
BOOL _idleTimerDisabled;
BOOL _networkActivityIndicatorVisible;
BOOL _applicationSupportsShakeToEdit;
View
2  UIKit/Classes/UIBarButtonItem.h
@@ -67,7 +67,7 @@ typedef enum {
@package
CGFloat _width;
UIView *_customView;
- id _target;
+ __unsafe_unretained id _target;
SEL _action;
BOOL _isSystemItem;
UIBarButtonSystemItem _systemItem;
View
2  UIKit/Classes/UIGestureRecognizer.h
@@ -50,7 +50,7 @@ typedef enum {
@interface UIGestureRecognizer : NSObject {
@private
- id _delegate;
+ __unsafe_unretained id _delegate;
BOOL _delaysTouchesBegan;
BOOL _delaysTouchesEnded;
BOOL _cancelsTouchesInView;
View
2  UIKit/Classes/UINavigationBar.h
@@ -44,7 +44,7 @@
@private
NSMutableArray *_navStack;
UIColor *_tintColor;
- id _delegate;
+ __unsafe_unretained id _delegate;
UIView *_leftView;
UIView *_centerView;
View
2  UIKit/Classes/UINavigationController.h
@@ -42,7 +42,7 @@
UINavigationBar *_navigationBar;
UIToolbar *_toolbar;
NSMutableArray *_viewControllers;
- id _delegate;
+ __unsafe_unretained id _delegate;
BOOL _toolbarHidden;
BOOL _navigationBarHidden;
View
4 UIKit/Classes/UIPickerView.h
@@ -38,8 +38,8 @@
@protocol UIPickerViewDataSource, UIPickerViewDelegate;
@interface UIPickerView : UIView {
- id<UIPickerViewDataSource> _dataSource;
- id<UIPickerViewDelegate> _delegate;
+ __unsafe_unretained id<UIPickerViewDataSource> _dataSource;
+ __unsafe_unretained id<UIPickerViewDelegate> _delegate;
BOOL _showsSelectionIndicator;
}
View
2  UIKit/Classes/UIPopoverController.h
@@ -58,7 +58,7 @@ typedef NSUInteger UIPopoverArrowDirection;
id _popoverWindow;
id _overlayWindow;
- id _delegate;
+ __unsafe_unretained id _delegate;
struct {
BOOL popoverControllerDidDismissPopover : 1;
BOOL popoverControllerShouldDismissPopover : 1;
View
2  UIKit/Classes/UIScrollView.h
@@ -56,7 +56,7 @@ extern const float UIScrollViewDecelerationRateFast;
@interface UIScrollView : UIView {
@package
- id _delegate;
+ __unsafe_unretained id _delegate;
@private
CGPoint _contentOffset;
CGSize _contentSize;
View
2  UIKit/Classes/UIScroller.h
@@ -42,7 +42,7 @@ CGFloat UIScrollerWidthForBoundsSize(CGSize boundsSize);
@interface UIScroller : UIView {
@private
- id _delegate;
+ __unsafe_unretained id<_UIScrollerDelegate> _delegate;
CGFloat _contentOffset;
CGFloat _contentSize;
CGFloat _dragOffset;
View
2  UIKit/Classes/UISearchBar.h
@@ -41,7 +41,7 @@
@interface UISearchBar : UIView {
UITextField *_searchField;
BOOL _showsCancelButton;
- id<UISearchBarDelegate> _delegate;
+ __unsafe_unretained id<UISearchBarDelegate> _delegate;
NSString *_placeholder;
}
View
6 UIKit/Classes/UISearchDisplayController.h
@@ -42,9 +42,9 @@
UIViewController *_viewController;
UISearchBar *_searchBar;
UITableView *_tableView;
- id<UISearchDisplayDelegate> _delegate;
- id<UITableViewDataSource> _tableViewDataSource;
- id<UITableViewDelegate> _tableViewDelegate;
+ __unsafe_unretained id<UISearchDisplayDelegate> _delegate;
+ __unsafe_unretained id<UITableViewDataSource> _tableViewDataSource;
+ __unsafe_unretained id<UITableViewDelegate> _tableViewDelegate;
}
- (id)initWithSearchBar:(UISearchBar *)searchBar contentsController:(UIViewController *)viewController;
View
2  UIKit/Classes/UISplitViewController.h
@@ -33,7 +33,7 @@
@interface UISplitViewController : UIViewController {
@private
- id <UISplitViewControllerDelegate> _delegate;
+ __unsafe_unretained id <UISplitViewControllerDelegate> _delegate;
NSArray *_viewControllers;
struct {
View
2  UIKit/Classes/UITabBar.h
@@ -52,7 +52,7 @@
@interface UITabBar : UIView {
- id<UITabBarDelegate> _delegate;
+ __unsafe_unretained id<UITabBarDelegate> _delegate;
NSArray *_items;
NSInteger _selectedItemIndex;
}
View
2  UIKit/Classes/UITabBarController.h
@@ -43,7 +43,7 @@
@class UITabBar;
@interface UITabBarController : UIViewController {
UITabBar *_tabBar;
- UIViewController *_selectedViewController;
+ __unsafe_unretained UIViewController *_selectedViewController;
NSArray *_viewControllers;
NSUInteger _selectedIndex;
}
View
2  UIKit/Classes/UITableView.h
@@ -91,7 +91,7 @@ typedef enum {
@interface UITableView : UIScrollView {
@private
UITableViewStyle _style;
- id<UITableViewDataSource> _dataSource;
+ __unsafe_unretained id<UITableViewDataSource> _dataSource;
BOOL _needsReload;
CGFloat _rowHeight;
UIColor *_separatorColor;
View
2  UIKit/Classes/UITextField.h
@@ -67,7 +67,7 @@ typedef enum {
@private
UITextLayer *_textLayer;
- id _delegate;
+ __unsafe_unretained id _delegate;
UITextFieldViewMode _clearButtonMode;
UIView *_leftView;
UITextFieldViewMode _leftViewMode;
View
2  UIKit/Classes/UITransitionView.h
@@ -53,7 +53,7 @@ typedef enum {
@interface UITransitionView : UIView {
UITransition _transition;
UIView *_view;
- id<UITransitionViewDelegate> _delegate;
+ __unsafe_unretained id<UITransitionViewDelegate> _delegate;
}
- (id)initWithFrame:(CGRect)frame view:(UIView *)aView;
View
2  UIKit/Classes/UIWebView.h
@@ -51,7 +51,7 @@ typedef NSUInteger UIWebViewNavigationType;
@interface UIWebView : UIView {
@private
- id _delegate;
+ __unsafe_unretained id _delegate;
NSURLRequest *_request;
UIDataDetectorTypes _dataDetectorTypes;
WebView *_webView;
Please sign in to comment.
Something went wrong with that request. Please try again.