diff options
46 files changed, 115 insertions, 134 deletions
diff --git a/macosx/HBAddCategoryController.h b/macosx/HBAddCategoryController.h index d6fe70e00..6aa2d34c0 100644 --- a/macosx/HBAddCategoryController.h +++ b/macosx/HBAddCategoryController.h @@ -6,8 +6,7 @@ #import <Cocoa/Cocoa.h> -@class HBPresetsManager; -@class HBPreset; +@import HandBrakeKit; NS_ASSUME_NONNULL_BEGIN diff --git a/macosx/HBAddCategoryController.m b/macosx/HBAddCategoryController.m index f7d5eb9dc..082adf7b5 100644 --- a/macosx/HBAddCategoryController.m +++ b/macosx/HBAddCategoryController.m @@ -6,9 +6,6 @@ #import "HBAddCategoryController.h" -#import "HBPresetsManager.h" -#import "HBPreset.h" - @interface HBAddCategoryController () <NSTextFieldDelegate> @property (nonatomic, strong) IBOutlet NSTextField *name; diff --git a/macosx/HBAddPresetController.h b/macosx/HBAddPresetController.h index 43dc1b646..51b08eacd 100644 --- a/macosx/HBAddPresetController.h +++ b/macosx/HBAddPresetController.h @@ -8,8 +8,7 @@ NS_ASSUME_NONNULL_BEGIN -@class HBPreset; -@class HBPresetsManager; +@import HandBrakeKit; @interface HBAddPresetController : NSWindowController diff --git a/macosx/HBAddPresetController.m b/macosx/HBAddPresetController.m index 5bbcca0b0..76c992703 100644 --- a/macosx/HBAddPresetController.m +++ b/macosx/HBAddPresetController.m @@ -11,11 +11,6 @@ #import "HBAudioDefaultsController.h" #import "HBSubtitlesDefaultsController.h" -#import "HBPresetsManager.h" -#import "HBPreset.h" - -@import HandBrakeKit; - typedef NS_ENUM(NSUInteger, HBAddPresetControllerMode) { HBAddPresetControllerModeNone, HBAddPresetControllerModeCustom, diff --git a/macosx/HBAppDelegate.m b/macosx/HBAppDelegate.m index f61dafa16..74e425e2f 100644 --- a/macosx/HBAppDelegate.m +++ b/macosx/HBAppDelegate.m @@ -6,11 +6,11 @@ #import "HBAppDelegate.h" +@import HandBrakeKit; + #import "HBQueue.h" #import "HBUtilities.h" -#import "HBPresetsManager.h" -#import "HBPreset.h" #import "HBPresetsMenuBuilder.h" #import "HBPreferencesController.h" @@ -19,8 +19,6 @@ #import "HBOutputPanelController.h" #import "HBController.h" -@import HandBrakeKit; - #define PRESET_FILE @"UserPresets.json" #define QUEUE_FILE @"Queue.hbqueue" diff --git a/macosx/HBAudio.h b/macosx/HBAudio.h index 2c643cda3..bcbbb50f2 100644 --- a/macosx/HBAudio.h +++ b/macosx/HBAudio.h @@ -5,7 +5,7 @@ It may be used under the terms of the GNU General Public License. */ #import <Foundation/Foundation.h> -#import "HBPresetCoding.h" +#import <HandBrakeKit/HBPresetCoding.h> @class HBAudioTrack; @class HBTitleAudioTrack; diff --git a/macosx/HBAudioDefaults.h b/macosx/HBAudioDefaults.h index 58f4e39bc..e34a5ebc4 100644 --- a/macosx/HBAudioDefaults.h +++ b/macosx/HBAudioDefaults.h @@ -5,7 +5,7 @@ It may be used under the terms of the GNU General Public License. */ #import <Foundation/Foundation.h> -#import "HBPresetCoding.h" +#import <HandBrakeKit/HBPresetCoding.h> NS_ASSUME_NONNULL_BEGIN diff --git a/macosx/HBAutoNamer.m b/macosx/HBAutoNamer.m index 3b75de729..2ee00002f 100644 --- a/macosx/HBAutoNamer.m +++ b/macosx/HBAutoNamer.m @@ -6,7 +6,6 @@ #import "HBAutoNamer.h" -#import "HBJob.h" #import "HBJob+HBAdditions.h" #import "HBPreferencesKeys.h" diff --git a/macosx/HBController.h b/macosx/HBController.h index 4b951fd90..818c027c2 100644 --- a/macosx/HBController.h +++ b/macosx/HBController.h @@ -6,11 +6,10 @@ #import <Cocoa/Cocoa.h> +@import HandBrakeKit; + @class HBAppDelegate; @class HBQueue; -@class HBPresetsManager; - -@class HBJob; NS_ASSUME_NONNULL_BEGIN diff --git a/macosx/HBController.m b/macosx/HBController.m index ed1db7204..763da6901 100644 --- a/macosx/HBController.m +++ b/macosx/HBController.m @@ -15,9 +15,6 @@ #import "HBQueue.h" #import "HBQueueWorker.h" -#import "HBPresetsManager.h" -#import "HBPreset.h" -#import "HBMutablePreset.h" #import "HBPresetsMenuBuilder.h" #import "HBSummaryViewController.h" @@ -213,6 +210,13 @@ static void *HBControllerLogLevelContext = &HBControllerLogLevelContext; self.window.tabbingMode = NSWindowTabbingModeDisallowed; } +#if defined(NSAppKitVersionNumber10_15) + if (@available (macOS 10.16, *)) + { + self.window.toolbarStyle = NSWindowToolbarStyleExpanded; + } +#endif + [self enableUI:NO]; // Bottom diff --git a/macosx/HBFilters+UIAdditions.h b/macosx/HBFilters+UIAdditions.h index 1d3a48019..6b4268885 100644 --- a/macosx/HBFilters+UIAdditions.h +++ b/macosx/HBFilters+UIAdditions.h @@ -5,7 +5,7 @@ It may be used under the terms of the GNU General Public License. */ #import <Foundation/Foundation.h> -#import "HBFilters.h" +#import <HandBrakeKit/HBFilters.h> @interface HBFilters (UIAdditions) diff --git a/macosx/HBFilters.h b/macosx/HBFilters.h index fa29493a6..3185e8205 100644 --- a/macosx/HBFilters.h +++ b/macosx/HBFilters.h @@ -5,7 +5,7 @@ It may be used under the terms of the GNU General Public License. */ #import <Foundation/Foundation.h> -#import "HBPresetCoding.h" +#import <HandBrakeKit/HBPresetCoding.h> NS_ASSUME_NONNULL_BEGIN diff --git a/macosx/HBJob+HBJobConversion.m b/macosx/HBJob+HBJobConversion.m index f6197e73e..f6c09b9a5 100644 --- a/macosx/HBJob+HBJobConversion.m +++ b/macosx/HBJob+HBJobConversion.m @@ -16,6 +16,13 @@ #import "HBTitle+Private.h" #import "HBMutablePreset.h" +#import "HBRange.h" +#import "HBVideo.h" +#import "HBPicture.h" +#import "HBFilters.h" +#import "HBAudio.h" +#import "HBSubtitles.h" + @implementation HBJob (HBJobConversion) - (NSDictionary *)jobDict diff --git a/macosx/HBJob+UIAdditions.h b/macosx/HBJob+UIAdditions.h index 7eef32785..ec72255b7 100644 --- a/macosx/HBJob+UIAdditions.h +++ b/macosx/HBJob+UIAdditions.h @@ -5,7 +5,7 @@ It may be used under the terms of the GNU General Public License. */ #import <Cocoa/Cocoa.h> -#import "HBJob.h" +#import <HandBrakeKit/HBJob.h> @interface HBJob (UIAdditions) diff --git a/macosx/HBJob+UIAdditions.m b/macosx/HBJob+UIAdditions.m index baa7d0f88..6993ebc83 100644 --- a/macosx/HBJob+UIAdditions.m +++ b/macosx/HBJob+UIAdditions.m @@ -21,6 +21,13 @@ #import "HBAudioTransformers.h" #import "HBLocalizationUtilities.h" +#import "HBRange.h" +#import "HBVideo.h" +#import "HBPicture.h" +#import "HBFilters.h" +#import "HBAudio.h" +#import "HBSubtitles.h" + #include "handbrake/handbrake.h" // Text Styles diff --git a/macosx/HBJob.h b/macosx/HBJob.h index a00c8cd36..b33224692 100644 --- a/macosx/HBJob.h +++ b/macosx/HBJob.h @@ -6,20 +6,18 @@ #import <Foundation/Foundation.h> -@class HBPreset; -@class HBMutablePreset; +@class HBPreset, HBMutablePreset; @class HBTitle; - -#import "HBRange.h" -#import "HBVideo.h" -#import "HBPicture.h" -#import "HBFilters.h" - -#import "HBAudio.h" -#import "HBSubtitles.h" -#import "HBChapter.h" - -#import "HBSecurityAccessToken.h" +@class HBVideo; +@class HBRange; +@class HBPicture; +@class HBFilters; +@class HBAudio; +@class HBSubtitles; +@class HBChapter; + +#import <HandBrakeKit/HBPresetCoding.h> +#import <HandBrakeKit/HBSecurityAccessToken.h> NS_ASSUME_NONNULL_BEGIN diff --git a/macosx/HBJobOutputFileWriter.h b/macosx/HBJobOutputFileWriter.h index f5394ca47..b2528fc2d 100644 --- a/macosx/HBJobOutputFileWriter.h +++ b/macosx/HBJobOutputFileWriter.h @@ -6,9 +6,9 @@ #import "HBOutputFileWriter.h" -NS_ASSUME_NONNULL_BEGIN +@import HandBrakeKit; -@class HBJob; +NS_ASSUME_NONNULL_BEGIN /** * Redirects the output to a new file based on the job destination diff --git a/macosx/HBJobOutputFileWriter.m b/macosx/HBJobOutputFileWriter.m index dbd331257..8594413ea 100644 --- a/macosx/HBJobOutputFileWriter.m +++ b/macosx/HBJobOutputFileWriter.m @@ -5,8 +5,6 @@ It may be used under the terms of the GNU General Public License. */ #import "HBJobOutputFileWriter.h" -#import "HBJob.h" -#import "HBUtilities.h" #import "HBPreferencesKeys.h" @interface HBJobOutputFileWriter () diff --git a/macosx/HBMutablePreset.h b/macosx/HBMutablePreset.h index 80d37ebaa..13ea64509 100644 --- a/macosx/HBMutablePreset.h +++ b/macosx/HBMutablePreset.h @@ -5,7 +5,7 @@ It may be used under the terms of the GNU General Public License. */ #import <Foundation/Foundation.h> -#import "HBPreset.h" +#import <HandBrakeKit/HBPreset.h> NS_ASSUME_NONNULL_BEGIN diff --git a/macosx/HBOutputFileWriter.m b/macosx/HBOutputFileWriter.m index 20b2e5084..5021e82fb 100644 --- a/macosx/HBOutputFileWriter.m +++ b/macosx/HBOutputFileWriter.m @@ -5,7 +5,8 @@ It may be used under the terms of the GNU General Public License. */ #import "HBOutputFileWriter.h" -#import "HBUtilities.h" + +@import HandBrakeKit.HBUtilities; @implementation HBOutputFileWriter { diff --git a/macosx/HBOutputPanelController.m b/macosx/HBOutputPanelController.m index ecfcc7de7..1dc8d43eb 100644 --- a/macosx/HBOutputPanelController.m +++ b/macosx/HBOutputPanelController.m @@ -7,7 +7,8 @@ #import "HBOutputPanelController.h" #import "HBOutputRedirect.h" #import "HBOutputFileWriter.h" -#import "HBUtilities.h" + +@import HandBrakeKit.HBUtilities; /// Maximum amount of characters that can be shown in the view. #define TextStorageUpperSizeLimit 125000 diff --git a/macosx/HBPicture+UIAdditions.h b/macosx/HBPicture+UIAdditions.h index ed1ebe80a..d67e4f719 100644 --- a/macosx/HBPicture+UIAdditions.h +++ b/macosx/HBPicture+UIAdditions.h @@ -5,7 +5,7 @@ It may be used under the terms of the GNU General Public License. */ #import <Foundation/Foundation.h> -#import "HBPicture.h" +#import <HandBrakeKit/HBPicture.h> @interface HBPicture (UIAdditions) diff --git a/macosx/HBPicture.h b/macosx/HBPicture.h index d94593669..aa3997ff4 100644 --- a/macosx/HBPicture.h +++ b/macosx/HBPicture.h @@ -5,7 +5,7 @@ It may be used under the terms of the GNU General Public License. */ #import <Foundation/Foundation.h> -#import "HBPresetCoding.h" +#import <HandBrakeKit/HBPresetCoding.h> @class HBTitle; diff --git a/macosx/HBPicture.m b/macosx/HBPicture.m index 113a77142..177f6f416 100644 --- a/macosx/HBPicture.m +++ b/macosx/HBPicture.m @@ -743,19 +743,19 @@ fail: if ([preset[@"PicturePAR"] isEqualToString:@"off"]) { - self.anamorphicMode = HB_ANAMORPHIC_NONE; + self.anamorphicMode = (HBPictureAnarmophicMode)HB_ANAMORPHIC_NONE; } else if ([preset[@"PicturePAR"] isEqualToString:@"auto"]) { - self.anamorphicMode = HB_ANAMORPHIC_AUTO; + self.anamorphicMode = (HBPictureAnarmophicMode)HB_ANAMORPHIC_AUTO; } else if ([preset[@"PicturePAR"] isEqualToString:@"custom"]) { - self.anamorphicMode = HB_ANAMORPHIC_CUSTOM; + self.anamorphicMode = (HBPictureAnarmophicMode)HB_ANAMORPHIC_CUSTOM; } else { - self.anamorphicMode = HB_ANAMORPHIC_LOOSE; + self.anamorphicMode = (HBPictureAnarmophicMode)HB_ANAMORPHIC_LOOSE; } self.parWidth = [par[@"Num"] intValue]; diff --git a/macosx/HBPreferencesController.m b/macosx/HBPreferencesController.m index 3f6c085c3..bf735e809 100644 --- a/macosx/HBPreferencesController.m +++ b/macosx/HBPreferencesController.m @@ -140,6 +140,13 @@ NSString * const HBQueueWorkerCounts = @"HBQueueWorkerCounts"; */ - (void)windowDidLoad { +#if defined(NSAppKitVersionNumber10_15) + if (@available (macOS 10.16, *)) + { + self.window.toolbarStyle = NSWindowToolbarStylePreference; + } +#endif + NSToolbar *toolbar = [[NSToolbar alloc] initWithIdentifier: @"Preferences Toolbar"]; [toolbar setDelegate: self]; [toolbar setAllowsUserCustomization: NO]; diff --git a/macosx/HBPreset.h b/macosx/HBPreset.h index 75a8a6a42..77b7f82e9 100644 --- a/macosx/HBPreset.h +++ b/macosx/HBPreset.h @@ -5,7 +5,7 @@ It may be used under the terms of the GNU General Public License. */ #import <Foundation/Foundation.h> -#import "HBTreeNode.h" +#import <HandBrakeKit/HBTreeNode.h> NS_ASSUME_NONNULL_BEGIN diff --git a/macosx/HBPresetsViewController.m b/macosx/HBPresetsViewController.m index 360b20e85..5b6d18453 100644 --- a/macosx/HBPresetsViewController.m +++ b/macosx/HBPresetsViewController.m @@ -336,6 +336,13 @@ static void *HBPresetsViewControllerContext = &HBPresetsViewControllerContext; [alert addButtonWithTitle:NSLocalizedString(@"Delete Preset", @"Delete preset alert -> first button")]; } +#if defined(NSAppKitVersionNumber10_15) + if (@available(macOS 10.16, *)) + { + alert.buttons.lastObject.hasDestructiveAction = true; + } +#endif + [alert addButtonWithTitle:NSLocalizedString(@"Cancel", @"Delete preset alert -> second button")]; NSInteger status = [alert runModal]; diff --git a/macosx/HBQueueController.m b/macosx/HBQueueController.m index f182310ab..3830a3e02 100644 --- a/macosx/HBQueueController.m +++ b/macosx/HBQueueController.m @@ -96,6 +96,13 @@ self.window.tabbingMode = NSWindowTabbingModeDisallowed; } +#if defined(NSAppKitVersionNumber10_15) + if (@available (macOS 10.16, *)) + { + self.window.toolbarStyle = NSWindowToolbarStyleExpanded; + } +#endif + // Set up the child view controllers _splitViewController = [[NSSplitViewController alloc] init]; _splitViewController.view.wantsLayer = YES; @@ -154,11 +161,11 @@ { if (self.queue.pendingItemsCount == 1) { - string = [NSString stringWithFormat: NSLocalizedString(@"%d encode pending", @"Queue status"), self.queue.pendingItemsCount]; + string = [NSString stringWithFormat: NSLocalizedString(@"%lu encode pending", @"Queue status"), (unsigned long)self.queue.pendingItemsCount]; } else { - string = [NSString stringWithFormat: NSLocalizedString(@"%d encodes pending", @"Queue status"), self.queue.pendingItemsCount]; + string = [NSString stringWithFormat: NSLocalizedString(@"%lu encodes pending", @"Queue status"), (unsigned long)self.queue.pendingItemsCount]; } self.window.title = [NSString stringWithFormat: NSLocalizedString(@"Queue (%@)", @"Queue window title"), string]; @@ -305,6 +312,12 @@ [alert setInformativeText:NSLocalizedString(@"Your movie will be lost if you don't continue encoding.", @"Queue Stop Alert -> stop and remove informative text")]; [alert addButtonWithTitle:NSLocalizedString(@"Keep Encoding", @"Queue Stop Alert -> stop and remove first button")]; [alert addButtonWithTitle:NSLocalizedString(@"Stop Encoding and Delete", @"Queue Stop Alert -> stop and remove second button")]; +#if defined(NSAppKitVersionNumber10_15) + if (@available(macOS 10.16, *)) + { + alert.buttons.lastObject.hasDestructiveAction = true; + } +#endif [alert setAlertStyle:NSAlertStyleCritical]; [alert beginSheetModalForWindow:targetWindow completionHandler:^(NSModalResponse returnCode) { @@ -360,6 +373,12 @@ [alert setInformativeText:NSLocalizedString(@"Your movie will be lost if you don't continue encoding.", @"Queue Edit Alert -> stop and edit informative text")]; [alert addButtonWithTitle:NSLocalizedString(@"Keep Encoding", @"Queue Edit Alert -> stop and edit first button")]; [alert addButtonWithTitle:NSLocalizedString(@"Stop Encoding and Edit", @"Queue Edit Alert -> stop and edit second button")]; +#if defined(NSAppKitVersionNumber10_15) + if (@available(macOS 10.16, *)) + { + alert.buttons.lastObject.hasDestructiveAction = true; + } +#endif [alert setAlertStyle:NSAlertStyleCritical]; [alert beginSheetModalForWindow:docWindow completionHandler:^(NSModalResponse returnCode) { diff --git a/macosx/HBQueueMultiSelectionViewController.m b/macosx/HBQueueMultiSelectionViewController.m index f0e5b63f0..cdea56052 100644 --- a/macosx/HBQueueMultiSelectionViewController.m +++ b/macosx/HBQueueMultiSelectionViewController.m @@ -28,7 +28,7 @@ } else { - self.label.stringValue = [NSString stringWithFormat:NSLocalizedString(@"%llu jobs selected", @""), self.count]; + self.label.stringValue = [NSString stringWithFormat:NSLocalizedString(@"%lu jobs selected", @""), (unsigned long)self.count]; } } diff --git a/macosx/HBRange+UIAdditions.h b/macosx/HBRange+UIAdditions.h index e9bec6c9a..252ae4120 100644 --- a/macosx/HBRange+UIAdditions.h +++ b/macosx/HBRange+UIAdditions.h @@ -5,7 +5,7 @@ It may be used under the terms of the GNU General Public License. */ #import <Foundation/Foundation.h> -#import "HBRange.h" +#import <HandBrakeKit/HBRange.h> @interface HBRange (UIAdditions) diff --git a/macosx/HBRenamePresetController.h b/macosx/HBRenamePresetController.h index 35b2b914d..e663d42b1 100644 --- a/macosx/HBRenamePresetController.h +++ b/macosx/HBRenamePresetController.h @@ -8,8 +8,7 @@ NS_ASSUME_NONNULL_BEGIN -@class HBPreset; -@class HBPresetsManager; +@import HandBrakeKit; @interface HBRenamePresetController : NSWindowController diff --git a/macosx/HBRenamePresetController.m b/macosx/HBRenamePresetController.m index 4b944f36c..205d1bf24 100644 --- a/macosx/HBRenamePresetController.m +++ b/macosx/HBRenamePresetController.m @@ -6,11 +6,6 @@ #import "HBRenamePresetController.h" -#import "HBPresetsManager.h" -#import "HBPreset.h" - -@import HandBrakeKit; - @interface HBRenamePresetController () <NSTextFieldDelegate> @property (nonatomic, strong) IBOutlet NSTextField *name; diff --git a/macosx/HBSubtitles.h b/macosx/HBSubtitles.h index 9689161ef..d7096d523 100644 --- a/macosx/HBSubtitles.h +++ b/macosx/HBSubtitles.h @@ -5,8 +5,8 @@ It may be used under the terms of the GNU General Public License. */ #import <Foundation/Foundation.h> -#import "HBPresetCoding.h" -#import "HBSecurityAccessToken.h" +#import <HandBrakeKit/HBPresetCoding.h> +#import <HandBrakeKit/HBSecurityAccessToken.h> NS_ASSUME_NONNULL_BEGIN diff --git a/macosx/HBSubtitlesDefaults.h b/macosx/HBSubtitlesDefaults.h index a44551e1e..3f7dc216a 100644 --- a/macosx/HBSubtitlesDefaults.h +++ b/macosx/HBSubtitlesDefaults.h @@ -5,7 +5,7 @@ It may be used under the terms of the GNU General Public License. */ #import <Foundation/Foundation.h> -#import "HBPresetCoding.h" +#import <HandBrakeKit/HBPresetCoding.h> NS_ASSUME_NONNULL_BEGIN diff --git a/macosx/HBTitle.h b/macosx/HBTitle.h index e8429e2c7..a3df84108 100644 --- a/macosx/HBTitle.h +++ b/macosx/HBTitle.h @@ -5,7 +5,7 @@ It may be used under the terms of the GNU General Public License. */ #import <Foundation/Foundation.h> -#import "HBSecurityAccessToken.h" +#import <HandBrakeKit/HBSecurityAccessToken.h> NS_ASSUME_NONNULL_BEGIN diff --git a/macosx/HBUtilities.h b/macosx/HBUtilities.h index 02abc5be1..fd4704624 100644 --- a/macosx/HBUtilities.h +++ b/macosx/HBUtilities.h @@ -5,7 +5,7 @@ It may be used under the terms of the GNU General Public License. */ #import <Foundation/Foundation.h> -#import "HBSecurityAccessToken.h" +#import <HandBrakeKit/HBSecurityAccessToken.h> NS_ASSUME_NONNULL_BEGIN diff --git a/macosx/HBVideo+UIAdditions.h b/macosx/HBVideo+UIAdditions.h index af0a5f116..5290c3a1a 100644 --- a/macosx/HBVideo+UIAdditions.h +++ b/macosx/HBVideo+UIAdditions.h @@ -5,7 +5,7 @@ It may be used under the terms of the GNU General Public License. */ #import <Foundation/Foundation.h> -#import "HBVideo.h" +#import <HandBrakeKit/HBVideo.h> @interface HBVideo (UIAdditions) diff --git a/macosx/HBVideo.h b/macosx/HBVideo.h index 8f3647123..352b274f9 100644 --- a/macosx/HBVideo.h +++ b/macosx/HBVideo.h @@ -5,7 +5,7 @@ It may be used under the terms of the GNU General Public License. */ #import <Foundation/Foundation.h> -#import "HBPresetCoding.h" +#import <HandBrakeKit/HBPresetCoding.h> @class HBJob; diff --git a/macosx/HandBrake.xcodeproj/project.pbxproj b/macosx/HandBrake.xcodeproj/project.pbxproj index cff42539f..9541258de 100644 --- a/macosx/HandBrake.xcodeproj/project.pbxproj +++ b/macosx/HandBrake.xcodeproj/project.pbxproj @@ -1419,7 +1419,7 @@ A939855322315628001DCAEB /* org.sparkle-project.InstallerLauncher.xpc */, A939855422315628001DCAEB /* org.sparkle-project.InstallerStatus.xpc */, ); - path = XPCService; + name = XPCService; sourceTree = "<group>"; }; A93E6F2E1CD774960096C0DE /* Player */ = { @@ -1921,7 +1921,7 @@ isa = PBXProject; attributes = { CLASSPREFIX = HB; - LastUpgradeCheck = 1150; + LastUpgradeCheck = 1200; ORGANIZATIONNAME = HandBrake; TargetAttributes = { 273F203814ADBC200021BE6D = { @@ -2777,6 +2777,7 @@ CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_SEMICOLON_BEFORE_METHOD_BODY = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; @@ -2861,6 +2862,7 @@ CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_SEMICOLON_BEFORE_METHOD_BODY = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; @@ -4335,6 +4337,7 @@ CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_SEMICOLON_BEFORE_METHOD_BODY = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; @@ -4613,6 +4616,7 @@ CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_SEMICOLON_BEFORE_METHOD_BODY = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; diff --git a/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Debug-Sandbox.xcscheme b/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Debug-Sandbox.xcscheme index 5533366c8..99501884b 100644 --- a/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Debug-Sandbox.xcscheme +++ b/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Debug-Sandbox.xcscheme @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <Scheme - LastUpgradeVersion = "1150" + LastUpgradeVersion = "1200" version = "1.3"> <BuildAction parallelizeBuildables = "YES" @@ -55,15 +55,6 @@ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv = "YES"> - <MacroExpansion> - <BuildableReference - BuildableIdentifier = "primary" - BlueprintIdentifier = "273F1FFE14ADAE950021BE6D" - BuildableName = "HandBrakeCLI" - BlueprintName = "HandBrakeCLI" - ReferencedContainer = "container:HandBrake.xcodeproj"> - </BuildableReference> - </MacroExpansion> <Testables> </Testables> </TestAction> diff --git a/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Debug.xcscheme b/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Debug.xcscheme index 9cd138a9d..d0a75ec3d 100644 --- a/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Debug.xcscheme +++ b/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Debug.xcscheme @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <Scheme - LastUpgradeVersion = "1150" + LastUpgradeVersion = "1200" version = "1.3"> <BuildAction parallelizeBuildables = "YES" @@ -41,15 +41,6 @@ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv = "YES"> - <MacroExpansion> - <BuildableReference - BuildableIdentifier = "primary" - BlueprintIdentifier = "273F203814ADBC200021BE6D" - BuildableName = "HandBrake.app" - BlueprintName = "HandBrake" - ReferencedContainer = "container:HandBrake.xcodeproj"> - </BuildableReference> - </MacroExpansion> <Testables> <TestableReference skipped = "NO"> diff --git a/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Release-Sandbox.xcscheme b/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Release-Sandbox.xcscheme index 487c05dfc..d7ec66451 100644 --- a/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Release-Sandbox.xcscheme +++ b/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Release-Sandbox.xcscheme @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <Scheme - LastUpgradeVersion = "1150" + LastUpgradeVersion = "1200" version = "1.3"> <BuildAction parallelizeBuildables = "YES" @@ -55,15 +55,6 @@ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv = "YES"> - <MacroExpansion> - <BuildableReference - BuildableIdentifier = "primary" - BlueprintIdentifier = "273F1FFE14ADAE950021BE6D" - BuildableName = "HandBrakeCLI" - BlueprintName = "HandBrakeCLI" - ReferencedContainer = "container:HandBrake.xcodeproj"> - </BuildableReference> - </MacroExpansion> <Testables> <TestableReference skipped = "NO"> diff --git a/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Release.xcscheme b/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Release.xcscheme index f65e5221c..555699c1e 100644 --- a/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Release.xcscheme +++ b/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Release.xcscheme @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <Scheme - LastUpgradeVersion = "1150" + LastUpgradeVersion = "1200" version = "1.3"> <BuildAction parallelizeBuildables = "YES" @@ -55,15 +55,6 @@ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv = "YES"> - <MacroExpansion> - <BuildableReference - BuildableIdentifier = "primary" - BlueprintIdentifier = "273F203814ADBC200021BE6D" - BuildableName = "HandBrake.app" - BlueprintName = "HandBrake" - ReferencedContainer = "container:HandBrake.xcodeproj"> - </BuildableReference> - </MacroExpansion> <Testables> <TestableReference skipped = "NO"> diff --git a/macosx/HandBrakeKitTests/HBJobTests.m b/macosx/HandBrakeKitTests/HBJobTests.m index e61df46d8..7a3e04cde 100644 --- a/macosx/HandBrakeKitTests/HBJobTests.m +++ b/macosx/HandBrakeKitTests/HBJobTests.m @@ -7,14 +7,7 @@ #import <Cocoa/Cocoa.h> #import <XCTest/XCTest.h> -#import "HBCore.h" -#import "HBTitle.h" -#import "HBJob.h" -#import "HBPicture.h" -#import "HBJob+UIAdditions.h" -#import "HBPresetsManager.h" -#import "HBPreset.h" -#import "HBMutablePreset.h" +@import HandBrakeKit; @interface HBJobTests : XCTestCase diff --git a/macosx/HandBrakeKitTests/HBJobUndoTests.m b/macosx/HandBrakeKitTests/HBJobUndoTests.m index 449247e47..b9adad198 100644 --- a/macosx/HandBrakeKitTests/HBJobUndoTests.m +++ b/macosx/HandBrakeKitTests/HBJobUndoTests.m @@ -6,15 +6,7 @@ #import <XCTest/XCTest.h> -#import "HBCore.h" -#import "HBTitle.h" -#import "HBJob.h" -#import "HBChapter.h" -#import "HBAudioTrack.h" -#import "HBSubtitlesTrack.h" -#import "HBPicture.h" -#import "HBPresetsManager.h" -#import "HBPreset.h" +@import HandBrakeKit; @interface HBJobUndoTests : XCTestCase diff --git a/macosx/HandBrakeKitTests/HBPresetsTests.m b/macosx/HandBrakeKitTests/HBPresetsTests.m index af7e48ddd..b5b371b74 100644 --- a/macosx/HandBrakeKitTests/HBPresetsTests.m +++ b/macosx/HandBrakeKitTests/HBPresetsTests.m @@ -7,8 +7,7 @@ #import <Cocoa/Cocoa.h> #import <XCTest/XCTest.h> -#import "HBPreset.h" -#import "HBPresetsManager.h" +@import HandBrakeKit; @interface HBPresetsTests : XCTestCase |