From 1cebcd3acf013b2b09087750e79dda7b90e93b5f Mon Sep 17 00:00:00 2001
From: Tomáš Znamenáček
Date: Tue, 5 Aug 2014 16:42:31 +0200
Subject: Removed -data and shortcutWithData: from MASShortcut.

Using NSKeyedUnarchiver and NSKeyedArchiver directly is almost the
same amount of typing and it’s much clearer what goes on.
---
 Framework/MASShortcutView+UserDefaults.m | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'Framework/MASShortcutView+UserDefaults.m')

diff --git a/Framework/MASShortcutView+UserDefaults.m b/Framework/MASShortcutView+UserDefaults.m
index a84f0c9..55584f4 100644
--- a/Framework/MASShortcutView+UserDefaults.m
+++ b/Framework/MASShortcutView+UserDefaults.m
@@ -72,7 +72,7 @@ void *kShortcutValueObserver = &kShortcutValueObserver;
     // Read initial shortcut value from user preferences
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
     NSData *data = [defaults dataForKey:_userDefaultsKey];
-    _shortcutView.shortcutValue = [MASShortcut shortcutWithData:data];
+    _shortcutView.shortcutValue = [NSKeyedUnarchiver unarchiveObjectWithData:data];
 
     // Observe user preferences to update shortcut value when it changed
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(userDefaultsDidChange:) name:NSUserDefaultsDidChangeNotification object:defaults];
@@ -88,7 +88,7 @@ void *kShortcutValueObserver = &kShortcutValueObserver;
 
     _internalShortcutChange = YES;
     NSData *data = [note.object dataForKey:_userDefaultsKey];
-    _shortcutView.shortcutValue = [MASShortcut shortcutWithData:data];
+    _shortcutView.shortcutValue = [NSKeyedUnarchiver unarchiveObjectWithData:data];
     _internalShortcutChange = NO;
 }
 
@@ -112,7 +112,7 @@ void *kShortcutValueObserver = &kShortcutValueObserver;
         _internalPreferenceChange = YES;
 
         NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-        [defaults setObject:(shortcut.data ?: [NSKeyedArchiver archivedDataWithRootObject:nil]) forKey:_userDefaultsKey];
+        [defaults setObject:[NSKeyedArchiver archivedDataWithRootObject:shortcut] forKey:_userDefaultsKey];
         [defaults synchronize];
 
         _internalPreferenceChange = NO;
-- 
cgit v1.2.3