mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

'beginSheet:modalForWindow:modalDelegate:didEndSelector:contextInfo:' is deprecated: (#3031) 

Co-authored-by: Charles Kerr <charles@charleskerr.com>
This commit is contained in:
Antoine Cœur 2022-05-14 21:20:56 +08:00 committed by GitHub
parent 340f88bc12
commit c1f5911fc7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
macosx/FileRenameSheetController.mm
View File

@ -18,7 +18,6 @@ typedef void (^CompletionBlock)(BOOL);
@property(nonatomic) Torrent* torrent;
@property(nonatomic) FileListNode* node;
@property(nonatomic, copy) CompletionBlock completionHandler;
@property(nonatomic, copy) NSString* originalName;
@ -36,11 +35,8 @@ typedef void (^CompletionBlock)(BOOL);
FileRenameSheetController* renamer = [[FileRenameSheetController alloc] initWithWindowNibName:@"FileRenameSheetController"];
renamer.torrent = torrent;
renamer.completionHandler = completionHandler;
[NSApp beginSheet:renamer.window modalForWindow:window modalDelegate:self
didEndSelector:@selector(sheetDidEnd:returnCode:contextInfo:)
contextInfo:(__bridge_retained void*)(renamer)];
[self presentSheetForRenamer:renamer modalForWindow:window completionHandler:completionHandler];
}
+ (void)presentSheetForFileListNode:(FileListNode*)node
@ -54,21 +50,19 @@ typedef void (^CompletionBlock)(BOOL);
renamer.torrent = node.torrent;
renamer.node = node;
renamer.completionHandler = completionHandler;
[NSApp beginSheet:renamer.window modalForWindow:window modalDelegate:self
didEndSelector:@selector(sheetDidEnd:returnCode:contextInfo:)
contextInfo:(__bridge_retained void*)(renamer)];
[self presentSheetForRenamer:renamer modalForWindow:window completionHandler:completionHandler];
}
+ (void)sheetDidEnd:(NSWindow*)sheet returnCode:(NSInteger)returnCode contextInfo:(void*)contextInfo
+ (void)presentSheetForRenamer:(FileRenameSheetController*)renamer
modalForWindow:(NSWindow*)window
completionHandler:(void (^)(BOOL))completionHandler
{
FileRenameSheetController* renamer = (__bridge_transfer FileRenameSheetController*)(contextInfo);
NSParameterAssert([renamer isKindOfClass:[FileRenameSheetController class]]);
[window beginSheet:renamer.window completionHandler:^(NSModalResponse returnCode) {
completionHandler(returnCode == NSModalResponseOK);
renamer.completionHandler(returnCode == NSModalResponseOK);
[sheet orderOut:self];
[renamer.window orderOut:self];
}];
}
- (void)windowDidLoad