Fixed build warnings in Xcode 7.3

git-up · Mar 28, 2016 · 3c60cab · 3c60cab
1 parent 1947684
commit 3c60cab
Show file tree

Hide file tree

Showing 11 changed files with 35 additions and 15 deletions.
diff --git a/GitUp/Application/AppDelegate.m b/GitUp/Application/AppDelegate.m
@@ -37,6 +37,10 @@
 #define kToolName @"gitup"
 #define kToolInstallPath @"/usr/local/bin/" kToolName
 
+@interface NSSavePanel (OSX_10_9)
+- (void)setShowsTagField:(BOOL)flag;
+@end
+
 @interface WelcomeView : NSView
 @end
 

diff --git a/GitUp/Application/Document.m b/GitUp/Application/Document.m
@@ -54,6 +54,10 @@
 
 #define kMaxProgressRefreshRate 10.0  // Hz
 
+@interface NSWindow (OSX_10_10)
+- (void)setTitleVisibility:(NSWindowTitleVisibility)visibility;
+@end
+
 @interface Document () <NSToolbarDelegate, NSTextFieldDelegate, GCLiveRepositoryDelegate,
                         GIWindowControllerDelegate, GIMapViewControllerDelegate, GISnapshotListViewControllerDelegate, GIUnifiedReflogViewControllerDelegate,
                         GICommitListViewControllerDelegate, GICommitRewriterViewControllerDelegate, GICommitSplitterViewControllerDelegate,
@@ -282,7 +286,7 @@ - (void)windowControllerDidLoadNib:(NSWindowController*)windowController {
   _mainWindow.backgroundColor = [NSColor whiteColor];
   [_mainWindow setToolbar:_toolbar];
   if (_unifiedToolbar) {
-    _mainWindow.titleVisibility = NSWindowTitleHidden;
+    [_mainWindow setTitleVisibility:NSWindowTitleHidden];
   }
   _contentView.wantsLayer = YES;
   _leftView.wantsLayer = YES;
@@ -545,7 +549,7 @@ - (void)_documentDidOpen:(id)restored {
         NSAlert* alert = [NSAlert alertWithMessageText:NSLocalizedString(@"Do you want to initialize submodules?", nil) defaultButton:NSLocalizedString(@"Initialize", nil) alternateButton:NSLocalizedString(@"Cancel", nil) otherButton:nil informativeTextWithFormat:@"One or more submodules in this repository are uninitialized."];
         alert.type = kGIAlertType_Caution;
         alert.showsSuppressionButton = YES;
-        [alert beginSheetModalForWindow:_mainWindow withCompletionHandler:^(NSModalResponse returnCode) {
+        [alert beginSheetModalForWindow:_mainWindow withCompletionHandler:^(NSInteger returnCode) {
 
           if (alert.suppressionButton.state) {
             [_repository setUserInfo:@(YES) forKey:kRepositoryUserInfoKey_SkipSubmoduleCheck];
@@ -1778,7 +1782,7 @@ - (IBAction)resetHard:(id)sender {
   alert.accessoryView = _resetView;
   [alert addButtonWithTitle:NSLocalizedString(@"Reset", nil)];
   [alert addButtonWithTitle:NSLocalizedString(@"Cancel", nil)];
-  [alert beginSheetModalForWindow:_mainWindow withCompletionHandler:^(NSModalResponse returnCode) {
+  [alert beginSheetModalForWindow:_mainWindow withCompletionHandler:^(NSInteger returnCode) {
 
     if (returnCode == NSAlertFirstButtonReturn) {
       NSError* error;

diff --git a/GitUpKit/Components/GIUnifiedReflogViewController.m b/GitUpKit/Components/GIUnifiedReflogViewController.m
@@ -277,7 +277,7 @@ - (IBAction)restoreEntry:(id)sender {
   alert.accessoryView = _restoreView;
   [alert addButtonWithTitle:NSLocalizedString(@"Create Branch", nil)];
   [alert addButtonWithTitle:NSLocalizedString(@"Cancel", nil)];
-  [self presentAlert:alert completionHandler:^(NSModalResponse returnCode) {
+  [self presentAlert:alert completionHandler:^(NSInteger returnCode) {
 
     if (returnCode == NSAlertFirstButtonReturn) {
       NSString* name = [_nameTextField.stringValue stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];

diff --git a/GitUpKit/GitUpKit.xcodeproj/project.pbxproj b/GitUpKit/GitUpKit.xcodeproj/project.pbxproj
@@ -1903,6 +1903,10 @@
 				);
 				PRODUCT_NAME = GitUpTests;
 				SDKROOT = macosx;
+				WARNING_CFLAGS = (
+					"$(inherited)",
+					"-Wno-partial-availability",
+				);
 			};
 			name = Debug;
 		};
@@ -1919,6 +1923,10 @@
 				);
 				PRODUCT_NAME = GitUpTests;
 				SDKROOT = macosx;
+				WARNING_CFLAGS = (
+					"$(inherited)",
+					"-Wno-partial-availability",
+				);
 			};
 			name = Release;
 		};
@@ -1951,6 +1959,10 @@
 				);
 				PRODUCT_NAME = GitUpTests;
 				SDKROOT = macosx;
+				WARNING_CFLAGS = (
+					"$(inherited)",
+					"-Wno-partial-availability",
+				);
 			};
 			name = Distribution;
 		};

diff --git a/GitUpKit/Utilities/GIAppKit.h b/GitUpKit/Utilities/GIAppKit.h
@@ -31,7 +31,7 @@ extern NSString* const GICommitMessageViewUserDefaultKey_EnableSpellChecking;
 @end
 
 @interface NSAlert (GIAppKit)
-- (void)beginSheetModalForWindow:(NSWindow*)window withCompletionHandler:(void (^)(NSModalResponse returnCode))handler;  // AppKit version is 10.9+ only
+- (void)beginSheetModalForWindow:(NSWindow*)window withCompletionHandler:(void (^)(NSInteger returnCode))handler;  // AppKit version is 10.9+ only
 - (void)setType:(GIAlertType)type;  // Set the alert icon
 @end
 

diff --git a/GitUpKit/Utilities/GIAppKit.m b/GitUpKit/Utilities/GIAppKit.m
@@ -54,14 +54,14 @@ - (void)appendString:(NSString*)string withAttributes:(NSDictionary*)attributes
 @implementation NSAlert (GIAppKit)
 
 + (void)_alertDidEnd:(NSAlert*)alert returnCode:(NSInteger)returnCode contextInfo:(void*)contextInfo {
-  void (^handler)(NSModalResponse) = contextInfo ? CFBridgingRelease(contextInfo) : NULL;
+  void (^handler)(NSInteger) = contextInfo ? CFBridgingRelease(contextInfo) : NULL;
   [alert.window orderOut:nil];  // Dismiss the alert window before the handler might chain another one
   if (handler) {
     handler(returnCode);
   }
 }
 
-- (void)beginSheetModalForWindow:(NSWindow*)window withCompletionHandler:(void (^)(NSModalResponse returnCode))handler {
+- (void)beginSheetModalForWindow:(NSWindow*)window withCompletionHandler:(void (^)(NSInteger returnCode))handler {
   [self beginSheetModalForWindow:window modalDelegate:[NSAlert class] didEndSelector:@selector(_alertDidEnd:returnCode:contextInfo:) contextInfo:(handler ? (void*)CFBridgingRetain(handler) : NULL)];
 }
 

diff --git a/GitUpKit/Utilities/GIViewController.h b/GitUpKit/Utilities/GIViewController.h
@@ -28,7 +28,7 @@
 @property(nonatomic, readonly, getter=isLiveResizing) BOOL liveResizing;
 @property(nonatomic, readonly) GIWindowController* windowController;
 - (instancetype)initWithRepository:(GCLiveRepository*)repository;
-- (void)presentAlert:(NSAlert*)alert completionHandler:(void (^)(NSModalResponse returnCode))handler;
+- (void)presentAlert:(NSAlert*)alert completionHandler:(void (^)(NSInteger returnCode))handler;
 @end
 
 @interface GIViewController (Extensions)

diff --git a/GitUpKit/Utilities/GIViewController.m b/GitUpKit/Utilities/GIViewController.m
@@ -182,7 +182,7 @@ - (GIWindowController*)windowController {
   return nil;
 }
 
-- (void)presentAlert:(NSAlert*)alert completionHandler:(void (^)(NSModalResponse returnCode))handler {
+- (void)presentAlert:(NSAlert*)alert completionHandler:(void (^)(NSInteger returnCode))handler {
   [alert beginSheetModalForWindow:self.view.window withCompletionHandler:handler];
 }
 
@@ -270,7 +270,7 @@ - (void)confirmUserActionWithAlertType:(GIAlertType)type
       defaultButton.keyEquivalent = @"";
     }
     [alert addButtonWithTitle:NSLocalizedString(@"Cancel", nil)];
-    [self presentAlert:alert completionHandler:^(NSModalResponse returnCode) {
+    [self presentAlert:alert completionHandler:^(NSInteger returnCode) {
 
       if (returnCode == NSAlertFirstButtonReturn) {
         block();

diff --git a/GitUpKit/Views/GIMapViewController+Operations.m b/GitUpKit/Views/GIMapViewController+Operations.m
@@ -752,7 +752,7 @@ - (void)smartMergeCommitOrBranch:(id)commitOrBranch intoLocalBranch:(GCHistoryLo
                                            otherButton:NSLocalizedString(@"Merge", nil)
                              informativeTextWithFormat:NSLocalizedString(@"Do you want to still create a merge or just fast-forward?", nil)];
         alert.type = kGIAlertType_Note;
-        [self presentAlert:alert completionHandler:^(NSModalResponse returnCode) {
+        [self presentAlert:alert completionHandler:^(NSInteger returnCode) {
 
           if (returnCode == NSAlertDefaultReturn) {
             [self fastForwardLocalBranch:intoBranch toCommitOrBranch:commitOrBranch withUserMessage:userMessage];
@@ -1200,7 +1200,7 @@ - (void)pullLocalBranchFromUpstream:(GCHistoryLocalBranch*)branch {
                                                otherButton:NSLocalizedString(@"Merge", nil)
                                  informativeTextWithFormat:NSLocalizedString(@"The branch \"%@\" has diverged from its upstream and cannot be fast-forwarded.", nil), branch.name];
             alert.type = kGIAlertType_Note;
-            [self presentAlert:alert completionHandler:^(NSModalResponse returnCode) {
+            [self presentAlert:alert completionHandler:^(NSInteger returnCode) {
 
               if (returnCode == NSAlertDefaultReturn) {
                 [self rebaseLocalBranch:branch fromCommit:ancestorCommit ontoCommit:upstream.tipCommit withUserMessage:nil];

diff --git a/GitUpKit/Views/GIMapViewController.m b/GitUpKit/Views/GIMapViewController.m
@@ -914,7 +914,7 @@ - (IBAction)checkoutSelectedCommit:(id)sender {
                                          otherButton:NSLocalizedString(@"Checkout Commit", nil)
                            informativeTextWithFormat:NSLocalizedString(@"The selected commit is also the tip of the remote branch \"%@\".", nil), branch.name];
       alert.type = kGIAlertType_Note;
-      [self presentAlert:alert completionHandler:^(NSModalResponse returnCode) {
+      [self presentAlert:alert completionHandler:^(NSInteger returnCode) {
 
         if (returnCode == NSAlertDefaultReturn) {
           [self checkoutRemoteBranch:branch];
@@ -984,7 +984,7 @@ - (IBAction)deleteSelectedCommit:(id)sender {
                                        otherButton:NSLocalizedString(@"Delete Commit", nil)
                          informativeTextWithFormat:NSLocalizedString(@"The selected commit is also the tip of the local branch \"%@\".", nil), localBranch.name];
     alert.type = kGIAlertType_Note;
-    [self presentAlert:alert completionHandler:^(NSModalResponse returnCode) {
+    [self presentAlert:alert completionHandler:^(NSInteger returnCode) {
 
       if (returnCode == NSAlertDefaultReturn) {
         [self deleteLocalBranch:localBranch];

diff --git a/Xcode-Configurations/Debug.xcconfig b/Xcode-Configurations/Debug.xcconfig
@@ -1,7 +1,7 @@
 #include "Base"
 
 GCC_PREPROCESSOR_DEFINITIONS = DEBUG=1
-WARNING_CFLAGS = -Wall -Weverything -Wshadow -Wshorten-64-to-32 -Wbool-conversion -Wconstant-conversion -Wundeclared-selector -Wno-pedantic -Wno-padded -Wno-direct-ivar-access -Wno-documentation-unknown-command -Wno-objc-missing-property-synthesis -Wno-implicit-retain-self -Wno-explicit-ownership-type -Wno-assign-enum -Wno-cast-align -Wno-switch-enum -Wno-gnu-statement-expression -Wno-cstring-format-directive -Wno-cast-qual -Wno-nullable-to-nonnull-conversion -Wno-reserved-id-macro -Wno-nonnull -Wno-property-attribute-mismatch
+WARNING_CFLAGS = -Wall -Weverything -Wshadow -Wshorten-64-to-32 -Wbool-conversion -Wconstant-conversion -Wundeclared-selector -Wno-pedantic -Wno-padded -Wno-direct-ivar-access -Wno-documentation-unknown-command -Wno-objc-missing-property-synthesis -Wno-implicit-retain-self -Wno-explicit-ownership-type -Wno-assign-enum -Wno-cast-align -Wno-switch-enum -Wno-gnu-statement-expression -Wno-cstring-format-directive -Wno-cast-qual -Wno-nullable-to-nonnull-conversion -Wno-reserved-id-macro -Wno-nonnull -Wno-property-attribute-mismatch -Wno-double-promotion
 
 ONLY_ACTIVE_ARCH = YES
 DEBUG_INFORMATION_FORMAT = dwarf