From e06cf82368649772eeab2d859261bc03aadc344c Mon Sep 17 00:00:00 2001
From: michael starke <michael.starke@hicknhack-software.com>
Date: Mon, 5 Sep 2016 12:17:13 +0200
Subject: [PATCH] Using modern Objective-C

---
 MacPass/MPOutlineDataSource.m                | 12 ++++++------
 MacPass/MPSavePanelAccessoryViewController.m |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/MacPass/MPOutlineDataSource.m b/MacPass/MPOutlineDataSource.m
index b82e24a9..9d2cde45 100644
--- a/MacPass/MPOutlineDataSource.m
+++ b/MacPass/MPOutlineDataSource.m
@@ -83,7 +83,7 @@
   
   KPKGroup *targetGroup = targetItem;
   BOOL validTarget = YES;
-  MPDocument *document = [[[outlineView window] windowController] document];
+  MPDocument *document = outlineView.window.windowController.document;
   /* Dragging Groups */
   if(draggedGroup) {
     self.localDraggedGroup = [document findGroup:draggedGroup.uuid];
@@ -177,18 +177,18 @@
   /* Cleanup old stuff */
   
   NSArray *types = [pasteboard types];
-  if([types count] > 1 || [types count] == 0) {
+  if(types.count > 1 || types.count == 0) {
     return NO;
   }
   
-  NSString *draggedType = [types lastObject];
+  NSString *draggedType = types.lastObject;
   if([draggedType isEqualToString:KPKGroupUTI]) {
     // dragging group
     NSArray *groups = [pasteboard readObjectsForClasses:@[[KPKGroup class]] options:nil];
-    if([groups count] != 1) {
+    if(groups.count != 1) {
       return NO;
     }
-    *group = [groups lastObject];
+    *group = groups.lastObject;
     return YES;
   }
   else if([draggedType isEqualToString:KPKEntryUTI]) {
@@ -196,7 +196,7 @@
     if([entries count] != 1) {
       return NO; // NO entry readable
     }
-    *entry = [entries lastObject];
+    *entry = entries.lastObject;
     return YES;
   }
   return NO;
diff --git a/MacPass/MPSavePanelAccessoryViewController.m b/MacPass/MPSavePanelAccessoryViewController.m
index 66d74965..f884bf57 100644
--- a/MacPass/MPSavePanelAccessoryViewController.m
+++ b/MacPass/MPSavePanelAccessoryViewController.m
@@ -30,7 +30,7 @@
     NSString *extension = [self.document fileNameExtensionForType:uti saveOperation:NSSaveOperation];
     NSString *title = [NSString stringWithFormat:@"%@ (%@)", description, extension];
     [menu addItemWithTitle:title action:@selector(setFileType:) keyEquivalent:@""];
-    NSMenuItem *item = [[menu itemArray] lastObject];
+    NSMenuItem *item = menu.itemArray.lastObject;
     item.target =  self;
     item.representedObject = uti;
   }
@@ -81,7 +81,7 @@
 }
 
 - (void)_updateNote {
-  NSString *uti = [[self.fileTypePopupButton selectedItem] representedObject];
+  NSString *uti = self.fileTypePopupButton.selectedItem.representedObject;
   BOOL showInfoText = (self.document.tree.minimumType == KPKDatabaseTypeXml && [uti isEqualToString:MPLegacyDocumentUTI]);
   self.infoTextField.hidden = !showInfoText;
 }