From fb49a4ac230fe753783d67583bc14695eba11f93 Mon Sep 17 00:00:00 2001
From: michael starke <michael.starke@hicknhack-software.com>
Date: Tue, 26 Sep 2017 17:06:59 +0200
Subject: [PATCH] made API more terse on type

---
 MacPass/MPPasteBoardController.h |  4 +--
 MacPass/MPPasteBoardController.m | 45 ++++++++++++++------------------
 2 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/MacPass/MPPasteBoardController.h b/MacPass/MPPasteBoardController.h
index 96a54df9..9df63b45 100644
--- a/MacPass/MPPasteBoardController.h
+++ b/MacPass/MPPasteBoardController.h
@@ -48,7 +48,7 @@ FOUNDATION_EXPORT NSString *const MPPasteBoardControllerDidClearClipboard;
 
 - (void)stashObjects;
 - (void)restoreObjects;
-- (void)copyObjects:(NSArray *)objects;
-- (void)copyObjectsWithoutTimeout:(NSArray *)objects;
+- (void)copyObjects:(NSArray<id<NSPasteboardWriting>> *)objects;
+- (void)copyObjectsWithoutTimeout:(NSArray<id<NSPasteboardWriting>> *)objects;
 
 @end
diff --git a/MacPass/MPPasteBoardController.m b/MacPass/MPPasteBoardController.m
index c2579216..8f143178 100644
--- a/MacPass/MPPasteBoardController.m
+++ b/MacPass/MPPasteBoardController.m
@@ -61,15 +61,6 @@ NSString *const MPPasteBoardControllerDidClearClipboard = @"com.hicknhack.macpas
   }
 }
 
-- (void)_updateNotifications {
-  if(self.clearPasteboardOnShutdown) {
-    [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(_clearPasteboardContents) name:NSApplicationWillTerminateNotification object:nil];
-  }
-  else {
-    [NSNotificationCenter.defaultCenter removeObserver:self];
-  }
-}
-
 - (void)setClearPasteboardOnShutdown:(BOOL)clearPasteboardOnShutdown {
   if(_clearPasteboardOnShutdown != clearPasteboardOnShutdown ) {
     _clearPasteboardOnShutdown = !_clearPasteboardOnShutdown;
@@ -79,7 +70,7 @@ NSString *const MPPasteBoardControllerDidClearClipboard = @"com.hicknhack.macpas
 
 - (void)stashObjects {
   self.stashedObjects = [NSMutableArray array];
-  for (NSPasteboardItem *item in [NSPasteboard generalPasteboard].pasteboardItems) {
+  for (NSPasteboardItem *item in NSPasteboard.generalPasteboard.pasteboardItems) {
     NSPasteboardItem *newItem = [[NSPasteboardItem alloc] init];
     for (NSString *type in item.types) {
       NSData *data = [[item dataForType:type] mutableCopy];
@@ -93,14 +84,14 @@ NSString *const MPPasteBoardControllerDidClearClipboard = @"com.hicknhack.macpas
 
 - (void)restoreObjects {
   if (self.stashedObjects) {
-    [[NSPasteboard generalPasteboard] clearContents];
-    [[NSPasteboard generalPasteboard] writeObjects:self.stashedObjects];
+    [NSPasteboard.generalPasteboard clearContents];
+    [NSPasteboard.generalPasteboard writeObjects:self.stashedObjects];
     self.stashedObjects = nil;
     self.isEmpty = YES;
   }
 }
 
-- (void)copyObjects:(NSArray *)objects {
+- (void)copyObjects:(NSArray<id<NSPasteboardWriting>> *)objects {
   [self copyObjectsWithoutTimeout:objects];
   if(self.clearTimeout != 0) {
     [NSNotificationCenter.defaultCenter postNotificationName:MPPasteBoardControllerDidCopyObjects object:self];
@@ -108,10 +99,9 @@ NSString *const MPPasteBoardControllerDidClearClipboard = @"com.hicknhack.macpas
   }
 }
 
-- (void)copyObjectsWithoutTimeout:(NSArray *)objects
-{
-  [[NSPasteboard generalPasteboard] clearContents];
-  [[NSPasteboard generalPasteboard] writeObjects:objects];
+- (void)copyObjectsWithoutTimeout:(NSArray<id<NSPasteboardWriting>> *)objects {
+  [NSPasteboard.generalPasteboard clearContents];
+  [NSPasteboard.generalPasteboard writeObjects:objects];
   self.isEmpty = NO;
 }
 
@@ -124,19 +114,24 @@ NSString *const MPPasteBoardControllerDidClearClipboard = @"com.hicknhack.macpas
   self.isEmpty = YES;
 }
 
+- (void)_updateNotifications {
+  if(self.clearPasteboardOnShutdown) {
+    [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(_clearPasteboardContents) name:NSApplicationWillTerminateNotification object:nil];
+  }
+  else {
+    [NSNotificationCenter.defaultCenter removeObserver:self];
+  }
+}
+
 - (void)_setupBindings {
-  NSUserDefaultsController *userDefaultsController = [NSUserDefaultsController sharedUserDefaultsController];
-  NSString *clearOnShutdownKeyPath = [MPSettingsHelper defaultControllerPathForKey:kMPSettingsKeyClearPasteboardOnQuit];
-  NSString *clearTimoutKeyPath = [MPSettingsHelper defaultControllerPathForKey:kMPSettingsKeyPasteboardClearTimeout];
-  
   [self bind:NSStringFromSelector(@selector(clearPasteboardOnShutdown))
-    toObject:userDefaultsController
- withKeyPath:clearOnShutdownKeyPath
+    toObject:NSUserDefaultsController.sharedUserDefaultsController
+ withKeyPath:[MPSettingsHelper defaultControllerPathForKey:kMPSettingsKeyClearPasteboardOnQuit]
      options:nil];
   
   [self bind:NSStringFromSelector(@selector(clearTimeout))
-    toObject:userDefaultsController
- withKeyPath:clearTimoutKeyPath
+    toObject:NSUserDefaultsController.sharedUserDefaultsController
+ withKeyPath:[MPSettingsHelper defaultControllerPathForKey:kMPSettingsKeyPasteboardClearTimeout]
      options:nil];
 }