Killing more warnings.

nishiam27 · Feb 10, 2017 · b426da3 · b426da3
1 parent 9b80135
commit b426da3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/Custom Windows/Fullscreen/TSSTKeyWindow.m b/Custom Windows/Fullscreen/TSSTKeyWindow.m
@@ -37,7 +37,10 @@ @implementation TSSTKeyWindow
 
 
 
-- (id)initWithContentRect:(NSRect)contentRect styleMask:(NSUInteger)aStyle backing:(NSBackingStoreType)bufferingType defer:(BOOL)flag
+- (id)initWithContentRect:(NSRect)contentRect
+                styleMask:(NSWindowStyleMask)aStyle
+                  backing:(NSBackingStoreType)bufferingType
+                    defer:(BOOL)flag
 {
     self = [super initWithContentRect: contentRect styleMask: NSBorderlessWindowMask backing: bufferingType defer: flag];
 

diff --git a/Session/TSSTSessionWindowController.h b/Session/TSSTSessionWindowController.h
@@ -160,9 +160,6 @@ enum PageSelectionMode {
 - (void)extractPageWithSelection:(NSInteger)selection;
 - (void)changeViewForSelection;
 
-/* Used by the jump to page method */
-- (void)closeSheet:(int)code;
-
 - (NSImage *)imageForPageAtIndex:(int)index;
 - (NSString *)nameForPageAtIndex:(int)index;
 

diff --git a/Session/TSSTSessionWindowController.m b/Session/TSSTSessionWindowController.m
@@ -719,13 +719,13 @@ - (IBAction)togglePageExpose:(id)sender
 - (IBAction)launchJumpPanel:(id)sender
 {
 	[jumpField setIntValue: [pageController selectionIndex] + 1];
-	[NSApp beginSheet: jumpPanel modalForWindow: [self window] modalDelegate: self didEndSelector: @selector(closeSheet:) contextInfo: NULL];
+    [self.window beginSheet: jumpPanel completionHandler:^(NSModalResponse returnCode) { }];
 }
 
 
 - (IBAction)cancelJumpPanel:(id)sender
 {
-	[NSApp endSheet: jumpPanel returnCode: 0];
+	[self.window endSheet: jumpPanel returnCode: NSModalResponseAbort];
 }
 
 
@@ -737,7 +737,7 @@ - (IBAction)goToPage:(id)sender
         [pageController setSelectionIndex: index];
     }
 
-	[NSApp endSheet: jumpPanel returnCode: 1];
+	[self.window endSheet: jumpPanel returnCode: NSModalResponseContinue];
 }
 
 
@@ -957,11 +957,6 @@ - (void)setIconWithSelection:(NSInteger)selection andCropRect:(NSRect)cropRect
 }
 
 
-- (void)closeSheet:(int)code
-{
-	[jumpPanel close];
-}
-
 
 #pragma mark -
 #pragma mark Convenience Methods