From bbfa3892fd9479ec8bd0aade5db69dcb6ad46f67 Mon Sep 17 00:00:00 2001 From: michael starke Date: Fri, 26 Feb 2016 17:01:48 +0100 Subject: [PATCH] modern Objective-C --- MacPass/MPEntryInspectorViewController.m | 9 ++------- MacPass/MPSavePanelAccessoryViewController.m | 14 +++++++------- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/MacPass/MPEntryInspectorViewController.m b/MacPass/MPEntryInspectorViewController.m index 88903d21..ee0ee995 100644 --- a/MacPass/MPEntryInspectorViewController.m +++ b/MacPass/MPEntryInspectorViewController.m @@ -210,7 +210,7 @@ static NSString *kMPContentBindingString3 = @"content.%@.%@.%@"; } - (void)removeWindowAssociation:(id)sender { - NSInteger row = [self.windowAssociationsTableView selectedRow]; + NSInteger row = self.windowAssociationsTableView.selectedRow; if(row > - 1 && row < [self.contentEntry.autotype.associations count]) { [self.contentEntry.autotype removeAssociation:self.contentEntry.autotype.associations[row]]; } @@ -233,7 +233,7 @@ static NSString *kMPContentBindingString3 = @"content.%@.%@.%@"; } - (BOOL)validateMenuItem:(NSMenuItem *)menuItem { - switch([MPActionHelper typeForAction:[menuItem action]]) { + switch([MPActionHelper typeForAction:menuItem.action]) { case MPActionToggleQuicklook: { BOOL enabled = [[NSUserDefaults standardUserDefaults] boolForKey:kMPSettingsKeyEnableQuicklookPreview]; return enabled ? [self acceptsPreviewPanelControl:nil] : NO; @@ -476,9 +476,4 @@ static NSString *kMPContentBindingString3 = @"content.%@.%@.%@"; [self.titleTextField becomeFirstResponder]; } -- (void)_willSave:(NSNotification *)notification { - // Force selected textfield to end editing - [self.view.window makeFirstResponder:nil]; -} - @end diff --git a/MacPass/MPSavePanelAccessoryViewController.m b/MacPass/MPSavePanelAccessoryViewController.m index ab884207..bef78477 100644 --- a/MacPass/MPSavePanelAccessoryViewController.m +++ b/MacPass/MPSavePanelAccessoryViewController.m @@ -31,16 +31,16 @@ NSString *title = [NSString stringWithFormat:@"%@ (%@)", description, extension]; [menu addItemWithTitle:title action:@selector(setFileType:) keyEquivalent:@""]; NSMenuItem *item = [[menu itemArray] lastObject]; - [item setTarget:self]; - [item setRepresentedObject:uti]; + item.target = self; + item.representedObject = uti; } - [self.fileTypePopupButton setMenu:menu]; - [self.infoTextField setHidden:YES]; + self.fileTypePopupButton.menu = menu; + self.infoTextField.hidden = YES; [self updateView]; } - (IBAction)setFileType:(id)sender { - NSString *uti = [[self.fileTypePopupButton selectedItem] representedObject]; + NSString *uti = self.fileTypePopupButton.selectedItem.representedObject; if([uti isEqualToString:MPLegacyDocumentUTI]) { self.selectedVersion = KPKLegacyVersion; } @@ -49,7 +49,7 @@ } NSAssert(uti != nil, @"UTI cannot be nil"); [self _updateNote]; - [self.savePanel setAllowedFileTypes:@[uti]]; + self.savePanel.allowedFileTypes = @[uti]; } - (void)setDocument:(MPDocument *)document { @@ -63,7 +63,7 @@ /* Access view at least once to make sure it is properly loaded */ - NSView *view = [self view]; + NSView *view = self.view; NSAssert(view != nil, @"View has to be loaded at this point"); switch(self.document.versionForFileType) { case KPKLegacyVersion: