From 5e0d95cdc5d74a14de410d22f64e5cb0b14e99dc Mon Sep 17 00:00:00 2001 From: Michael Starke Date: Mon, 11 Dec 2017 17:05:30 +0100 Subject: [PATCH] using properties, removed unused code --- MacPass/MPDocumentWindowController.m | 12 ++++++------ MacPass/MPEntryViewController.m | 21 +++++++++++---------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/MacPass/MPDocumentWindowController.m b/MacPass/MPDocumentWindowController.m index a54e1a38..5514e1e9 100644 --- a/MacPass/MPDocumentWindowController.m +++ b/MacPass/MPDocumentWindowController.m @@ -103,11 +103,11 @@ typedef void (^MPPasswordChangedBlock)(BOOL didChangePassword); MPDocument *document = self.document; - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_didRevertDocument:) name:MPDocumentDidRevertNotifiation object:document]; - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_didUnlockDatabase:) name:MPDocumentDidUnlockDatabaseNotification object:document]; - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_didAddEntry:) name:MPDocumentDidAddEntryNotification object:document]; - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_didAddGroup:) name:MPDocumentDidAddGroupNotification object:document]; - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_didLockDatabase:) name:MPDocumentDidLockDatabaseNotification object:document]; + [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(_didRevertDocument:) name:MPDocumentDidRevertNotifiation object:document]; + [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(_didUnlockDatabase:) name:MPDocumentDidUnlockDatabaseNotification object:document]; + [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(_didAddEntry:) name:MPDocumentDidAddEntryNotification object:document]; + [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(_didAddGroup:) name:MPDocumentDidAddGroupNotification object:document]; + [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(_didLockDatabase:) name:MPDocumentDidLockDatabaseNotification object:document]; [self.entryViewController registerNotificationsForDocument:document]; [self.inspectorViewController registerNotificationsForDocument:document]; @@ -444,7 +444,7 @@ typedef void (^MPPasswordChangedBlock)(BOOL didChangePassword); } - (void)focusEntries:(id)sender { - [[self window] makeFirstResponder:[self.entryViewController reconmendedFirstResponder]]; + [self.window makeFirstResponder:[self.entryViewController reconmendedFirstResponder]]; } - (void)focusGroups:(id)sender { diff --git a/MacPass/MPEntryViewController.m b/MacPass/MPEntryViewController.m index 836a81a6..5de57cd9 100644 --- a/MacPass/MPEntryViewController.m +++ b/MacPass/MPEntryViewController.m @@ -125,17 +125,18 @@ NSString *const _MPTableSecurCellView = @"PasswordCell"; self.entryTable.floatsGroupRows = NO; [self.entryTable registerForDraggedTypes:@[KPKEntryUTI]]; /* First responder notifications */ - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(_didBecomFirstResponder:) - name:MPDidActivateViewNotification - object:_entryTable]; - /* - NSView *clipView = self.entryTable.enclosingScrollView.contentView; [NSNotificationCenter.defaultCenter addObserver:self - selector:@selector(_tableDidScroll:) - name:NSViewBoundsDidChangeNotification - object:clipView]; - */ + selector:@selector(_didBecomFirstResponder:) + name:MPDidActivateViewNotification + object:_entryTable]; + + /* + NSView *clipView = self.entryTable.enclosingScrollView.contentView; + [NSNotificationCenter.defaultCenter addObserver:self + selector:@selector(_tableDidScroll:) + name:NSViewBoundsDidChangeNotification + object:clipView]; + */ [self _setupEntryMenu];