Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2025-12-20 02:18:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
1 changed files with 9 additions and 15 deletions
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) Torrent* torrent;
@property(nonatomic) FileListNode* node; @property(nonatomic) FileListNode* node;
@property(nonatomic, copy) CompletionBlock completionHandler;
@property(nonatomic, copy) NSString* originalName; @property(nonatomic, copy) NSString* originalName;
@@ -36,11 +35,8 @@ typedef void (^CompletionBlock)(BOOL);
FileRenameSheetController* renamer = [[FileRenameSheetController alloc] initWithWindowNibName:@"FileRenameSheetController"]; FileRenameSheetController* renamer = [[FileRenameSheetController alloc] initWithWindowNibName:@"FileRenameSheetController"];
renamer.torrent = torrent; renamer.torrent = torrent;
renamer.completionHandler = completionHandler;
[NSApp beginSheet:renamer.window modalForWindow:window modalDelegate:self [self presentSheetForRenamer:renamer modalForWindow:window completionHandler:completionHandler];
didEndSelector:@selector(sheetDidEnd:returnCode:contextInfo:)
contextInfo:(__bridge_retained void*)(renamer)];
} }
+ (void)presentSheetForFileListNode:(FileListNode*)node + (void)presentSheetForFileListNode:(FileListNode*)node
@@ -54,21 +50,19 @@ typedef void (^CompletionBlock)(BOOL);
renamer.torrent = node.torrent; renamer.torrent = node.torrent;
renamer.node = node; renamer.node = node;
renamer.completionHandler = completionHandler;
[NSApp beginSheet:renamer.window modalForWindow:window modalDelegate:self [self presentSheetForRenamer:renamer modalForWindow:window completionHandler:completionHandler];
didEndSelector:@selector(sheetDidEnd:returnCode:contextInfo:)
contextInfo:(__bridge_retained void*)(renamer)];
} }
+ (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); [window beginSheet:renamer.window completionHandler:^(NSModalResponse returnCode) {
NSParameterAssert([renamer isKindOfClass:[FileRenameSheetController class]]); completionHandler(returnCode == NSModalResponseOK);
renamer.completionHandler(returnCode == NSModalResponseOK); [renamer.window orderOut:self];
}];
[sheet orderOut:self];
} }
- (void)windowDidLoad - (void)windowDidLoad