MacGui: add more nullability annotations.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@7257 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/macosx/HBAudio.h b/macosx/HBAudio.h
index 609f0fd2a7366388048caf0a0bf7d0d7744dd2ee..af37f4aa8cf6b3cde693f1dfe2e6550ad469ce28 100644 (file)
--- a/macosx/HBAudio.h
+++ b/macosx/HBAudio.h
@@ -11,6 +11,8 @@
 @class HBAudioTrack;
 @class HBAudioDefaults;
 
+NS_ASSUME_NONNULL_BEGIN
+
 extern NSString *HBAudioChangedNotification;
 
 @interface HBAudio : NSObject <NSSecureCoding, NSCopying, HBPresetCoding>
@@ -26,7 +28,7 @@ extern NSString *HBAudioChangedNotification;
 
 - (BOOL)anyCodecMatches:(int)codec;
 - (void)settingTrackToNone:(HBAudioTrack *)newNoneTrack;
-- (void)switchingTrackFromNone:(HBAudioTrack *)noLongerNoneTrack;
+- (void)switchingTrackFromNone:(nullable HBAudioTrack *)noLongerNoneTrack;
 
 - (void)containerChanged:(int)container;
 
@@ -40,3 +42,5 @@ extern NSString *HBAudioChangedNotification;
 - (void)removeObjectFromTracksAtIndex:(NSUInteger)index;
 
 @end
+
+NS_ASSUME_NONNULL_END

diff --git a/macosx/HBAudioDefaults.h b/macosx/HBAudioDefaults.h
index 114fee701dc59c7734e3347ff7eacf7809a2ff2b..8042eeb32cb4d6291f2862f90a1a1b4e0ee4e2e2 100644 (file)
--- a/macosx/HBAudioDefaults.h
+++ b/macosx/HBAudioDefaults.h
@@ -7,6 +7,8 @@
 #import <Foundation/Foundation.h>
 #import "HBPresetCoding.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 typedef NS_ENUM(NSUInteger, HBAudioTrackSelectionBehavior) {
     HBAudioTrackSelectionBehaviorNone,
     HBAudioTrackSelectionBehaviorFirst,
@@ -46,3 +48,5 @@ typedef NS_ENUM(NSUInteger, HBAudioTrackSelectionBehavior) {
 - (void)validateEncoderFallbackForVideoContainer:(int)container;
 
 @end
+
+NS_ASSUME_NONNULL_END

diff --git a/macosx/HBAudioTrack.h b/macosx/HBAudioTrack.h
index f46f854f55510411b1307d663eb0a1d47f86e950..e1333678df1d040bdb2effc67920b815f0d5dc3b 100644 (file)
--- a/macosx/HBAudioTrack.h
+++ b/macosx/HBAudioTrack.h
@@ -10,6 +10,8 @@
 @protocol HBAudioTrackDataSource;
 @protocol HBAudioTrackDelegate;
 
+NS_ASSUME_NONNULL_BEGIN
+
 /**
  *  Audio track dicts keys.
  */
@@ -34,15 +36,15 @@ extern NSString *keyAudioBitrate;
 @interface HBAudioTrack : NSObject <NSSecureCoding, NSCopying>
 
 @property (nonatomic, strong) NSDictionary *track;
-@property (nonatomic, strong) NSDictionary *codec;
+@property (nonatomic, strong, nullable) NSDictionary *codec;
 @property (nonatomic, strong) NSDictionary *mixdown;
 @property (nonatomic, strong) NSDictionary *sampleRate;
 @property (nonatomic, strong) NSDictionary *bitRate;
 @property (nonatomic, strong) NSNumber *drc;
 @property (nonatomic, strong) NSNumber *gain;
 @property (nonatomic, strong) NSNumber *videoContainerTag;
-@property (nonatomic, weak) id<HBAudioTrackDataSource> dataSource;
-@property (nonatomic, weak) id<HBAudioTrackDelegate> delegate;
+@property (nonatomic, weak, nullable) id<HBAudioTrackDataSource> dataSource;
+@property (nonatomic, weak, nullable) id<HBAudioTrackDelegate> delegate;
 
 @property (nonatomic, strong) NSMutableArray *codecs;
 @property (nonatomic, strong) NSMutableArray *mixdowns;
@@ -68,3 +70,5 @@ extern NSString *keyAudioBitrate;
 - (void)switchingTrackFromNone:(HBAudioTrack *)noLongerNoneTrack;
 - (void)mixdownChanged;
 @end
+
+NS_ASSUME_NONNULL_END

diff --git a/macosx/HBAudioTrackPreset.h b/macosx/HBAudioTrackPreset.h
index a7d849757e21164c0cbe13640667643c9e8e1a0d..f8f09ea14e372dd557a36a914792ec2efa88719f 100644 (file)
--- a/macosx/HBAudioTrackPreset.h
+++ b/macosx/HBAudioTrackPreset.h
@@ -6,6 +6,8 @@
 
 #import <Foundation/Foundation.h>
 
+NS_ASSUME_NONNULL_BEGIN
+
 /**
  *  HBAudioTrackPreset
  *  a KVO enabled class used in the Audio Defaults panels,
@@ -37,6 +39,8 @@
 
 @end
 
+NS_ASSUME_NONNULL_END
+
 /**
  *  A series of value trasformers to bridge the libhb enums
  *  to the textual rapresentations used in the interface.

diff --git a/macosx/HBSubtitles.h b/macosx/HBSubtitles.h
index 3e8819e2be99ddb0d3d729132318678c276a31ab..29487dd6c459ad4f200e0e934e4e6ed2b624d65a 100644 (file)
--- a/macosx/HBSubtitles.h
+++ b/macosx/HBSubtitles.h
@@ -7,6 +7,8 @@
 #import <Foundation/Foundation.h>
 #import "HBPresetCoding.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 extern NSString *keySubTrackSelectionIndex;
 extern NSString *keySubTrackName;
 extern NSString *keySubTrackIndex;
@@ -68,3 +70,5 @@ extern NSString *keySubTrackLanguageIndex;
 
 @end
 
+NS_ASSUME_NONNULL_END
+

diff --git a/macosx/HBSubtitlesDefaults.h b/macosx/HBSubtitlesDefaults.h
index 273086d6eb86e7afb871f7d7a1e54b2e02155f17..8b3fa6d4fa72b7df98623a22a0608aba9d997d7e 100644 (file)
--- a/macosx/HBSubtitlesDefaults.h
+++ b/macosx/HBSubtitlesDefaults.h
@@ -7,6 +7,8 @@
 #import <Foundation/Foundation.h>
 #import "HBPresetCoding.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 typedef NS_ENUM(NSUInteger, HBSubtitleTrackSelectionBehavior) {
     HBSubtitleTrackSelectionBehaviorNone,
     HBSubtitleTrackSelectionBehaviorFirst,
@@ -34,3 +36,5 @@ typedef NS_ENUM(NSUInteger, HBSubtitleTrackBurnInBehavior) {
 @property (nonatomic, readwrite) BOOL burnInBluraySubtitles;
 
 @end
+
+NS_ASSUME_NONNULL_END