Revision: 15499 http://sourceforge.net/p/skim-app/code/15499 Author: hofman Date: 2025-06-18 16:06:24 +0000 (Wed, 18 Jun 2025) Log Message: ----------- avoid variables
Modified Paths: -------------- trunk/SKMainDocument.m Modified: trunk/SKMainDocument.m =================================================================== --- trunk/SKMainDocument.m 2025-06-18 15:57:03 UTC (rev 15498) +++ trunk/SKMainDocument.m 2025-06-18 16:06:24 UTC (rev 15499) @@ -1113,7 +1113,6 @@ NSOpenPanel *oPanel = [NSOpenPanel openPanel]; NSURL *fileURL = [self fileURL]; NSButton *replaceNotesCheckButton = nil; - NSView *readNotesAccessoryView = nil; if ([self hasNotes]) { replaceNotesCheckButton = [[NSButton alloc] init]; @@ -1121,7 +1120,7 @@ [replaceNotesCheckButton setTitle:NSLocalizedString(@"Replace existing notes", @"Check button title")]; [replaceNotesCheckButton sizeToFit]; [replaceNotesCheckButton setFrameOrigin:NSMakePoint(CHECK_BUTTON_OFFSET_X, CHECK_BUTTON_OFFSET_Y)]; - readNotesAccessoryView = [[NSView alloc] initWithFrame:NSInsetRect([replaceNotesCheckButton frame], -CHECK_BUTTON_OFFSET_X, -CHECK_BUTTON_OFFSET_Y)]; + NSView *readNotesAccessoryView = [[NSView alloc] initWithFrame:NSInsetRect([replaceNotesCheckButton frame], -CHECK_BUTTON_OFFSET_X, -CHECK_BUTTON_OFFSET_Y)]; [readNotesAccessoryView addSubview:replaceNotesCheckButton]; [oPanel setAccessoryView:readNotesAccessoryView]; [replaceNotesCheckButton setState:NSControlStateValueOn]; @@ -1131,11 +1130,8 @@ [oPanel setDirectoryURL:[fileURL URLByDeletingLastPathComponent]]; [oPanel setAllowedFileTypes:@[SKDocumentTypeNotes]]; [oPanel beginSheetModalForWindow:[self windowForSheet] completionHandler:^(NSModalResponse result){ - if (result == NSModalResponseOK) { - NSURL *notesURL = [[oPanel URLs] objectAtIndex:0]; - BOOL replace = (replaceNotesCheckButton && [replaceNotesCheckButton state] == NSControlStateValueOn); - [self readNotesFromURL:notesURL replace:replace]; - } + if (result == NSModalResponseOK) + [self readNotesFromURL:[[oPanel URLs] firstObject] replace:[replaceNotesCheckButton state] == NSControlStateValueOn]; }]; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. _______________________________________________ Skim-app-commit mailing list Skim-app-commit@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/skim-app-commit