orderOut: isn't needed with beginSheet:/endSheet:

macosx/AboutWindowController.mm

@@ -80,7 +80,6 @@ AboutWindowController* fAboutBoxInstance = nil;
 
 - (IBAction)hideLicense:(id)sender
 {
-    [self.fLicenseSheet orderOut:nil];
     [self.window endSheet:self.fLicenseSheet];
 }
 

macosx/BlocklistDownloaderViewController.mm

@@ -91,7 +91,6 @@ BlocklistDownloaderViewController* fBLViewController = nil;
 - (void)setFinished
 {
     [self.fPrefsController.window endSheet:self.fStatusWindow];
-    [self.fStatusWindow orderOut:self];
 
     fBLViewController = nil;
 }
@@ -99,7 +98,6 @@ BlocklistDownloaderViewController* fBLViewController = nil;
 - (void)setFailed:(NSString*)error
 {
     [self.fPrefsController.window endSheet:self.fStatusWindow];
-    [self.fStatusWindow orderOut:self];
 
     NSAlert* alert = [[NSAlert alloc] init];
     [alert addButtonWithTitle:NSLocalizedString(@"OK", "Blocklist -> button")];

macosx/FileRenameSheetController.mm

@@ -58,10 +58,11 @@ typedef void (^CompletionBlock)(BOOL);
                 modalForWindow:(NSWindow*)window
              completionHandler:(void (^)(BOOL))completionHandler
 {
+    // we capture renamer strongly to avoid it being deallocated before completionHandler
+    __block FileRenameSheetController* strongRenamer = renamer;
     [window beginSheet:renamer.window completionHandler:^(NSModalResponse returnCode) {
         completionHandler(returnCode == NSModalResponseOK);
-
-        [renamer.window orderOut:self];
+        strongRenamer = nil;
     }];
 }
 

macosx/GroupsPrefsController.mm

@@ -295,7 +295,6 @@
 
 - (IBAction)cancelRules:(id)sender
 {
-    [self.groupRulesSheetWindow orderOut:nil];
     [self.fTableView.window endSheet:self.groupRulesSheetWindow];
 
     NSInteger index = [GroupsController.groups indexForRow:self.fTableView.selectedRow];
@@ -309,7 +308,6 @@
 
 - (IBAction)saveRules:(id)sender
 {
-    [self.groupRulesSheetWindow orderOut:nil];
     [self.fTableView.window endSheet:self.groupRulesSheetWindow];
 
     NSInteger index = [GroupsController.groups indexForRow:self.fTableView.selectedRow];

macosx/URLSheetWindowController.mm

@@ -68,13 +68,11 @@ NSString* urlString = nil;
 
 - (void)openURLEndSheet:(id)sender
 {
-    [self.window orderOut:sender];
     [NSApp endSheet:self.window returnCode:1];
 }
 
 - (void)openURLCancelEndSheet:(id)sender
 {
-    [self.window orderOut:sender];
     [NSApp endSheet:self.window returnCode:0];
 }