diff options
author | ritsuka <damiog@gmail.com> | 2015-08-06 09:48:39 +0000 |
---|---|---|
committer | ritsuka <damiog@gmail.com> | 2015-08-06 09:48:39 +0000 |
commit | d4a4a3ccd682ae6992902321e6bfcea0ff8c89a9 (patch) | |
tree | a87056672ceda97c51ea60cdb21fc7179622c0cb | |
parent | dbcbcdf1cbe9e0db0177c1d34cca91b6bd41f5a5 (diff) |
MacGui: second part of the previous commit
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@7392 b64f7644-9d1e-0410-96f1-a4d463321fa5
-rw-r--r-- | macosx/HBDVDDetector.m | 5 | ||||
-rw-r--r-- | macosx/HBDockTile.m | 5 | ||||
-rw-r--r-- | macosx/HBLanguagesSelection.h | 1 | ||||
-rw-r--r-- | macosx/HBLanguagesSelection.m | 5 | ||||
-rw-r--r-- | macosx/HBPresetsViewController.h | 2 | ||||
-rw-r--r-- | macosx/HBPreviewGenerator.h | 3 | ||||
-rw-r--r-- | macosx/HBPreviewGenerator.m | 5 | ||||
-rw-r--r-- | macosx/HBQueueController.h | 2 | ||||
-rw-r--r-- | macosx/HBVideo+UIAdditions.h | 1 | ||||
-rw-r--r-- | macosx/HBVideo+UIAdditions.m | 10 |
10 files changed, 36 insertions, 3 deletions
diff --git a/macosx/HBDVDDetector.m b/macosx/HBDVDDetector.m index 50be26b61..1d6c40d11 100644 --- a/macosx/HBDVDDetector.m +++ b/macosx/HBDVDDetector.m @@ -33,6 +33,11 @@ NSString *bsdName; } +- (instancetype)init +{ + @throw nil; +} + + (HBDVDDetector *)detectorForPath: (NSString *)aPath { return [[self alloc] initWithPath:aPath]; diff --git a/macosx/HBDockTile.m b/macosx/HBDockTile.m index f03e2fdff..1b61d71c5 100644 --- a/macosx/HBDockTile.m +++ b/macosx/HBDockTile.m @@ -22,6 +22,11 @@ NSString *dockTilePercentFormat = @"%2.1f%%"; @implementation HBDockTile +- (instancetype)init +{ + @throw nil; +} + - (instancetype)initWithDockTile:(NSDockTile *)dockTile image:(NSImage *)image { self = [super init]; diff --git a/macosx/HBLanguagesSelection.h b/macosx/HBLanguagesSelection.h index edaa8f140..b14d7d89a 100644 --- a/macosx/HBLanguagesSelection.h +++ b/macosx/HBLanguagesSelection.h @@ -21,6 +21,7 @@ @property (nonatomic, readonly) NSString *language; @property (nonatomic, readonly) NSString *iso639_2; +- (instancetype)init NS_UNAVAILABLE; - (instancetype)initWithLanguage:(NSString *)value iso639_2code:(NSString *)code NS_DESIGNATED_INITIALIZER; @end; diff --git a/macosx/HBLanguagesSelection.m b/macosx/HBLanguagesSelection.m index f848f9a10..d9d5a9b1e 100644 --- a/macosx/HBLanguagesSelection.m +++ b/macosx/HBLanguagesSelection.m @@ -9,6 +9,11 @@ @implementation HBLang +- (instancetype)init +{ + @throw nil; +} + - (instancetype)initWithLanguage:(NSString *)value iso639_2code:(NSString *)code { self = [super init]; diff --git a/macosx/HBPresetsViewController.h b/macosx/HBPresetsViewController.h index baa130117..d3356fe64 100644 --- a/macosx/HBPresetsViewController.h +++ b/macosx/HBPresetsViewController.h @@ -20,7 +20,7 @@ - (instancetype)initWithPresetManager:(HBPresetsManager *)presetManager; -@property (nonatomic, readwrite, weak) id<HBPresetsViewControllerDelegate> delegate; +@property (nonatomic, readwrite, assign) id<HBPresetsViewControllerDelegate> delegate; - (IBAction)exportPreset:(id)sender; - (IBAction)importPreset:(id)sender; diff --git a/macosx/HBPreviewGenerator.h b/macosx/HBPreviewGenerator.h index 9ca549d9f..88999b6a7 100644 --- a/macosx/HBPreviewGenerator.h +++ b/macosx/HBPreviewGenerator.h @@ -24,8 +24,9 @@ NS_ASSUME_NONNULL_BEGIN @interface HBPreviewGenerator : NSObject -@property (nonatomic, weak, nullable) id <HBPreviewGeneratorDelegate> delegate; +@property (nonatomic, assign, nullable) id <HBPreviewGeneratorDelegate> delegate; +- (instancetype)init NS_UNAVAILABLE; - (instancetype)initWithCore:(HBCore *)core job:(HBJob *)job NS_DESIGNATED_INITIALIZER; /* Still image generator */ diff --git a/macosx/HBPreviewGenerator.m b/macosx/HBPreviewGenerator.m index d3fb4ffee..60db556f9 100644 --- a/macosx/HBPreviewGenerator.m +++ b/macosx/HBPreviewGenerator.m @@ -25,6 +25,11 @@ @implementation HBPreviewGenerator +- (instancetype)init +{ + @throw nil; +} + - (instancetype)initWithCore:(HBCore *)core job:(HBJob *)job { self = [super init]; diff --git a/macosx/HBQueueController.h b/macosx/HBQueueController.h index fc99914f0..ca14104ba 100644 --- a/macosx/HBQueueController.h +++ b/macosx/HBQueueController.h @@ -20,7 +20,7 @@ NS_ASSUME_NONNULL_BEGIN /// The HBCore used for encoding. @property (nonatomic, readonly) HBCore *core; -@property (nonatomic, weak, nullable) HBController *controller; +@property (nonatomic, assign, nullable) HBController *controller; @property (nonatomic, weak, nullable) HBAppDelegate *delegate; @property (nonatomic, readonly) NSUInteger count; diff --git a/macosx/HBVideo+UIAdditions.h b/macosx/HBVideo+UIAdditions.h index 6817b7162..341c633ee 100644 --- a/macosx/HBVideo+UIAdditions.h +++ b/macosx/HBVideo+UIAdditions.h @@ -41,6 +41,7 @@ @end @interface HBPresetsTransformer : NSValueTransformer +- (instancetype)init NS_UNAVAILABLE; - (instancetype)initWithEncoder:(int)encoder NS_DESIGNATED_INITIALIZER; @end diff --git a/macosx/HBVideo+UIAdditions.m b/macosx/HBVideo+UIAdditions.m index cd07bde11..f0e6b2678 100644 --- a/macosx/HBVideo+UIAdditions.m +++ b/macosx/HBVideo+UIAdditions.m @@ -248,6 +248,11 @@ int _encoder; } +- (instancetype)init +{ + @throw nil; +} + - (instancetype)initWithEncoder:(int)encoder { self = [super init]; @@ -308,6 +313,11 @@ double _max; } +- (instancetype)init +{ + return [self initWithReversedDirection:NO min:0 max:50]; +} + - (instancetype)initWithReversedDirection:(BOOL)reverse min:(double)min max:(double)max { self = [super init]; |