Merge pull request Tencent#389 from wxlpp/Swift

Nullability and Objective-C
gank0326 · Aug 24, 2018 · 7b05d2d · 7b05d2d
2 parents 93c3cfd + d1deadd
commit 7b05d2d
Show file tree

Hide file tree

Showing 22 changed files with 35 additions and 35 deletions.
diff --git a/QMUIKit/QMUIComponents/ImagePickerLibrary/QMUIAlbumViewController.h b/QMUIKit/QMUIComponents/ImagePickerLibrary/QMUIAlbumViewController.h
@@ -101,6 +101,6 @@ extern const UIEdgeInsets QMUIAlbumTableViewCellDefaultAlbumNameInsets;
 
 @interface QMUIAlbumViewController (UIAppearance)
 
-+ (instancetype)appearance;
++ (nonnull instancetype)appearance;
 
 @end
diff --git a/QMUIKit/QMUIComponents/ImagePickerLibrary/QMUIAlbumViewController.m b/QMUIKit/QMUIComponents/ImagePickerLibrary/QMUIAlbumViewController.m
@@ -99,7 +99,7 @@ + (void)initialize {
 }
 
 static QMUIAlbumViewController *albumViewControllerAppearance;
-+ (instancetype)appearance {
++ (nonnull instancetype)appearance {
     static dispatch_once_t onceToken2;
     dispatch_once(&onceToken2, ^{
         if (!albumViewControllerAppearance) {

diff --git a/QMUIKit/QMUIComponents/ImagePickerLibrary/QMUIImagePickerPreviewViewController.h b/QMUIKit/QMUIComponents/ImagePickerLibrary/QMUIImagePickerPreviewViewController.h
@@ -76,6 +76,6 @@
 
 @interface QMUIImagePickerPreviewViewController (UIAppearance)
 
-+ (instancetype)appearance;
++ (nonnull instancetype)appearance;
 
 @end
diff --git a/QMUIKit/QMUIComponents/ImagePickerLibrary/QMUIImagePickerPreviewViewController.m b/QMUIKit/QMUIComponents/ImagePickerLibrary/QMUIImagePickerPreviewViewController.m
@@ -37,7 +37,7 @@ + (void)initialize {
 }
 
 static QMUIImagePickerPreviewViewController *imagePickerPreviewViewControllerAppearance;
-+ (instancetype)appearance {
++ (nonnull instancetype)appearance {
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
         if (!imagePickerPreviewViewControllerAppearance) {

diff --git a/QMUIKit/QMUIComponents/ImagePickerLibrary/QMUIImagePickerViewController.h b/QMUIKit/QMUIComponents/ImagePickerLibrary/QMUIImagePickerViewController.h
@@ -134,6 +134,6 @@
 
 @interface QMUIImagePickerViewController (UIAppearance)
 
-+ (instancetype)appearance;
++ (nonnull instancetype)appearance;
 
 @end
diff --git a/QMUIKit/QMUIComponents/ImagePickerLibrary/QMUIImagePickerViewController.m b/QMUIKit/QMUIComponents/ImagePickerLibrary/QMUIImagePickerViewController.m
@@ -50,7 +50,7 @@ + (void)initialize {
 }
 
 static QMUIImagePickerViewController *imagePickerViewControllerAppearance;
-+ (instancetype)appearance {
++ (nonnull instancetype)appearance {
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
         if (!imagePickerViewControllerAppearance) {

diff --git a/QMUIKit/QMUIComponents/QMUIAlertController.h b/QMUIKit/QMUIComponents/QMUIAlertController.h
@@ -51,7 +51,7 @@ typedef NS_ENUM(NSInteger, QMUIAlertControllerStyle) {
  *
  *  @return QMUIAlertController按钮的实例
  */
-+ (instancetype)actionWithTitle:(nullable NSString *)title style:(QMUIAlertActionStyle)style handler:(nullable void (^)(__kindof QMUIAlertController *aAlertController, QMUIAlertAction *action))handler;
++ (nonnull instancetype)actionWithTitle:(nullable NSString *)title style:(QMUIAlertActionStyle)style handler:(nullable void (^)(__kindof QMUIAlertController *aAlertController, QMUIAlertAction *action))handler;
 
 /// `QMUIAlertAction`对应的 button 对象
 @property(nonatomic, strong, readonly) QMUIButton *button;
@@ -196,16 +196,16 @@ typedef NS_ENUM(NSInteger, QMUIAlertControllerStyle) {
 
 
 /// 默认初始化方法
-- (instancetype)initWithTitle:(NSString *)title message:(NSString *)message preferredStyle:(QMUIAlertControllerStyle)preferredStyle;
+- (nonnull instancetype)initWithTitle:(nullable NSString *)title message:(nullable NSString *)message preferredStyle:(QMUIAlertControllerStyle)preferredStyle;
 
 /// 通过类方法初始化实例
-+ (instancetype)alertControllerWithTitle:(NSString *)title message:(NSString *)message preferredStyle:(QMUIAlertControllerStyle)preferredStyle;
++ (nonnull instancetype)alertControllerWithTitle:(nullable NSString *)title message:(nullable NSString *)message preferredStyle:(QMUIAlertControllerStyle)preferredStyle;
 
 /// @see `QMUIAlertControllerDelegate`
 @property(nonatomic,weak) id<QMUIAlertControllerDelegate>delegate;
 
 /// 增加一个按钮
-- (void)addAction:(QMUIAlertAction *)action;
+- (void)addAction:(nonnull QMUIAlertAction *)action;
 
 // 增加一个“取消”按钮，点击后 alertController 会被 hide
 - (void)addCancelAction;
@@ -271,7 +271,7 @@ typedef NS_ENUM(NSInteger, QMUIAlertControllerStyle) {
 
 @interface QMUIAlertController (UIAppearance)
 
-+ (instancetype)appearance;
++ (nonnull instancetype)appearance;
 
 @end
 

diff --git a/QMUIKit/QMUIComponents/QMUIAlertController.m b/QMUIKit/QMUIComponents/QMUIAlertController.m
@@ -66,15 +66,15 @@ @interface QMUIAlertAction ()
 
 @implementation QMUIAlertAction
 
-+ (instancetype)actionWithTitle:(NSString *)title style:(QMUIAlertActionStyle)style handler:(void (^)(__kindof QMUIAlertController *, QMUIAlertAction *))handler {
++ (nonnull instancetype)actionWithTitle:(nullable NSString *)title style:(QMUIAlertActionStyle)style handler:(void (^)(__kindof QMUIAlertController *, QMUIAlertAction *))handler {
     QMUIAlertAction *alertAction = [[QMUIAlertAction alloc] init];
     alertAction.title = title;
     alertAction.style = style;
     alertAction.handler = handler;
     return alertAction;
 }
 
-- (instancetype)init {
+- (nonnull instancetype)init {
     self = [super init];
     if (self) {
         _button = [[QMUIButton alloc] init];
@@ -111,7 +111,7 @@ + (void)initialize {
 }
 
 static QMUIAlertController *alertControllerAppearance;
-+ (instancetype)appearance {
++ (nonnull instancetype)appearance {
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
         [self resetAppearance];
@@ -501,15 +501,15 @@ - (void)setCancelButtonVisualEffectView:(UIView *)cancelButtonVisualEffectView {
     }
 }
 
-+ (instancetype)alertControllerWithTitle:(NSString *)title message:(NSString *)message preferredStyle:(QMUIAlertControllerStyle)preferredStyle {
++ (nonnull instancetype)alertControllerWithTitle:(nullable NSString *)title message:(nullable NSString *)message preferredStyle:(QMUIAlertControllerStyle)preferredStyle {
     QMUIAlertController *alertController = [[self alloc] initWithTitle:title message:message preferredStyle:preferredStyle];
     if (alertController) {
         return alertController;
     }
     return nil;
 }
 
-- (instancetype)initWithTitle:(NSString *)title message:(NSString *)message preferredStyle:(QMUIAlertControllerStyle)preferredStyle {
+- (nonnull instancetype)initWithTitle:(nullable NSString *)title message:(nullable NSString *)message preferredStyle:(QMUIAlertControllerStyle)preferredStyle {
     self = [self init];
     if (self) {
 
@@ -969,7 +969,7 @@ - (void)hideWithAnimated:(BOOL)animated completion:(void (^)(void))completion {
     alertControllerCount--;
 }
 
-- (void)addAction:(QMUIAlertAction *)action {
+- (void)addAction:(nonnull QMUIAlertAction *)action {
     if (action.style == QMUIAlertActionStyleCancel && self.cancelAction) {
         [NSException raise:@"QMUIAlertController使用错误" format:@"同一个alertController不可以同时添加两个cancel按钮"];
     }

diff --git a/QMUIKit/QMUIComponents/QMUIDialogViewController.h b/QMUIKit/QMUIComponents/QMUIDialogViewController.h
@@ -127,7 +127,7 @@
 
 @interface QMUIDialogViewController (UIAppearance)
 
-+ (instancetype)appearance;
++ (nonnull instancetype)appearance;
 @end
 
 /// 表示没有选中的item

diff --git a/QMUIKit/QMUIComponents/QMUIDialogViewController.m b/QMUIKit/QMUIComponents/QMUIDialogViewController.m
@@ -28,7 +28,7 @@ + (void)initialize {
 }
 
 static QMUIDialogViewController *dialogViewControllerAppearance;
-+ (instancetype)appearance {
++ (nonnull instancetype)appearance {
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
         if (!dialogViewControllerAppearance) {
@@ -443,7 +443,7 @@ + (void)initialize {
 }
 
 static QMUIDialogSelectionViewController *dialogSelectionViewControllerAppearance;
-+ (instancetype)appearance {
++ (nonnull instancetype)appearance {
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
         if (!dialogSelectionViewControllerAppearance) {
@@ -651,7 +651,7 @@ + (void)initialize {
 }
 
 static QMUIDialogTextFieldViewController *dialogTextFieldViewControllerAppearance;
-+ (instancetype)appearance {
++ (nonnull instancetype)appearance {
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
         if (!dialogTextFieldViewControllerAppearance) {

diff --git a/QMUIKit/QMUIComponents/QMUIImagePreviewViewController.h b/QMUIKit/QMUIComponents/QMUIImagePreviewViewController.h
@@ -76,5 +76,5 @@
 
 @interface QMUIImagePreviewViewController (UIAppearance)
 
-+ (instancetype)appearance;
++ (nonnull instancetype)appearance;
 @end
diff --git a/QMUIKit/QMUIComponents/QMUIImagePreviewViewController.m b/QMUIKit/QMUIComponents/QMUIImagePreviewViewController.m
@@ -20,7 +20,7 @@ + (void)initialize {
 }
 
 static QMUIImagePreviewViewController *imagePreviewViewControllerAppearance;
-+ (instancetype)appearance {
++ (nonnull instancetype)appearance {
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
         if (!imagePreviewViewControllerAppearance) {

diff --git a/QMUIKit/QMUIComponents/QMUIModalPresentationViewController.h b/QMUIKit/QMUIComponents/QMUIModalPresentationViewController.h
@@ -277,7 +277,7 @@ typedef NS_ENUM(NSUInteger, QMUIModalPresentationAnimationStyle) {
 
 @interface QMUIModalPresentationViewController (UIAppearance)
 
-+ (instancetype)appearance;
++ (nonnull instancetype)appearance;
 
 @end
 

diff --git a/QMUIKit/QMUIComponents/QMUIModalPresentationViewController.m b/QMUIKit/QMUIComponents/QMUIModalPresentationViewController.m
@@ -19,7 +19,7 @@ @interface UIViewController ()
 @implementation QMUIModalPresentationViewController (UIAppearance)
 
 static QMUIModalPresentationViewController *appearance;
-+ (instancetype)appearance {
++ (nonnull instancetype)appearance {
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
         [self initDefaultAppearance];

diff --git a/QMUIKit/QMUIComponents/QMUIMoreOperationController.h b/QMUIKit/QMUIComponents/QMUIMoreOperationController.h
@@ -110,7 +110,7 @@
 
 @interface QMUIMoreOperationController (UIAppearance)
 
-+ (instancetype)appearance;
++ (nonnull instancetype)appearance;
 
 @end
 

diff --git a/QMUIKit/QMUIComponents/QMUIMoreOperationController.m b/QMUIKit/QMUIComponents/QMUIMoreOperationController.m
@@ -39,7 +39,7 @@ + (void)initialize {
 }
 
 static QMUIMoreOperationController *moreOperationViewControllerAppearance;
-+ (instancetype)appearance {
++ (nonnull instancetype)appearance {
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
         [self resetAppearance];

diff --git a/QMUIKit/QMUIComponents/ToastView/QMUIToastView.h b/QMUIKit/QMUIComponents/ToastView/QMUIToastView.h
@@ -37,7 +37,7 @@ typedef NS_ENUM(NSInteger, QMUIToastViewPosition) {
  *
  * @param view ToastView的superView。
  */
-- (instancetype)initWithView:(UIView *)view NS_DESIGNATED_INITIALIZER;
+- (nonnull instancetype)initWithView:(nonnull UIView *)view NS_DESIGNATED_INITIALIZER;
 
 /**
  * parentView是ToastView初始化的时候传进去的那个view。
@@ -151,7 +151,7 @@ typedef NS_ENUM(NSInteger, QMUIToastViewPosition) {
  * @param view ToastView的superView。
  * @return 返回一个QMUIToastView的实例。
  */
-+ (instancetype)toastInView:(UIView *)view;
++ (nullable instancetype)toastInView:(UIView *)view;
 
 /**
  * 工具方法。返回`view`里面所有的ToastView，如果没有则返回nil。

diff --git a/QMUIKit/QMUIComponents/ToastView/QMUIToastView.m b/QMUIKit/QMUIComponents/ToastView/QMUIToastView.m
@@ -34,7 +34,7 @@ - (instancetype)initWithCoder:(NSCoder *)aDecoder {
     return [self initWithView:nil];
 }
 
-- (instancetype)initWithView:(UIView *)view {
+- (nonnull instancetype)initWithView:(nonnull UIView *)view {
     NSAssert(view, @"view不能为空");
     if (self = [super initWithFrame:view.bounds]) {
         _parentView = view;
@@ -307,7 +307,7 @@ + (BOOL)hideAllToastInView:(UIView *)view animated:(BOOL)animated {
     return returnFlag;
 }
 
-+ (instancetype)toastInView:(UIView *)view {
++ (nullable instancetype)toastInView:(UIView *)view {
     NSEnumerator *subviewsEnum = [view.subviews reverseObjectEnumerator];
     for (UIView *subview in subviewsEnum) {
         if ([subview isKindOfClass:self]) {

diff --git a/QMUIKit/QMUIMainFrame/QMUICommonTableViewController.h b/QMUIKit/QMUIMainFrame/QMUICommonTableViewController.h
@@ -36,7 +36,7 @@ extern NSString *const QMUICommonTableViewControllerSectionFooterIdentifier;
 @interface QMUICommonTableViewController : QMUICommonViewController<QMUITableViewDelegate, QMUITableViewDataSource>
 
 - (instancetype)initWithStyle:(UITableViewStyle)style NS_DESIGNATED_INITIALIZER;
-- (instancetype)initWithCoder:(NSCoder *)aDecoder NS_DESIGNATED_INITIALIZER;
+- (nullable instancetype)initWithCoder:(NSCoder *)aDecoder NS_DESIGNATED_INITIALIZER;
 
 /**
  *  初始化时调用的方法，会在两个 NS_DESIGNATED_INITIALIZER 方法中被调用，所以子类如果需要同时支持两个 NS_DESIGNATED_INITIALIZER 方法，则建议把初始化时要做的事情放到这个方法里。否则仅需重写要支持的那个 NS_DESIGNATED_INITIALIZER 方法即可。

diff --git a/QMUIKit/QMUIMainFrame/QMUICommonTableViewController.m b/QMUIKit/QMUIMainFrame/QMUICommonTableViewController.m
@@ -46,7 +46,7 @@ - (instancetype)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibB
     return [self init];
 }
 
-- (instancetype)initWithCoder:(NSCoder *)aDecoder {
+- (nullable instancetype)initWithCoder:(NSCoder *)aDecoder {
     if (self = [super initWithCoder:aDecoder]) {
         [self didInitializeWithStyle:UITableViewStylePlain];
     }

diff --git a/QMUIKit/QMUIMainFrame/QMUICommonViewController.h b/QMUIKit/QMUIMainFrame/QMUICommonViewController.h
@@ -33,7 +33,7 @@
 @interface QMUICommonViewController : UIViewController<QMUINavigationControllerDelegate>
 
 - (instancetype)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil NS_DESIGNATED_INITIALIZER;
-- (instancetype)initWithCoder:(NSCoder *)aDecoder NS_DESIGNATED_INITIALIZER;
+- (nullable instancetype)initWithCoder:(NSCoder *)aDecoder NS_DESIGNATED_INITIALIZER;
 
 /**
  *  初始化时调用的方法，会在两个 NS_DESIGNATED_INITIALIZER 方法中被调用，所以子类如果需要同时支持两个 NS_DESIGNATED_INITIALIZER 方法，则建议把初始化时要做的事情放到这个方法里。否则仅需重写要支持的那个 NS_DESIGNATED_INITIALIZER 方法即可。

diff --git a/QMUIKit/QMUIMainFrame/QMUICommonViewController.m b/QMUIKit/QMUIMainFrame/QMUICommonViewController.m
@@ -42,7 +42,7 @@ - (instancetype)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibB
     return self;
 }
 
-- (instancetype)initWithCoder:(NSCoder *)aDecoder {
+- (nullable instancetype)initWithCoder:(NSCoder *)aDecoder {
     if (self = [super initWithCoder:aDecoder]) {
         [self didInitialize];
     }
-Original file line number
+Diff line change
@@ Expand Up @@
     @interface QMUIModalPresentationViewController (UIAppearance)
-    + (instancetype)appearance;
+    + (nonnull instancetype)appearance;
     @end
@@ Expand Down @@