From 17b6eb144ab1fa39cb6a78b8bed1ed1600f19ed4 Mon Sep 17 00:00:00 2001
From: Leonardo Brondani Schenkel <leonardo@schenkel.net>
Date: Tue, 17 Feb 2015 15:36:50 +0100
Subject: [PATCH 3/4] Rename 'def' to 'keychain'

---
 FreeOTP/TokenStore.m | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/FreeOTP/TokenStore.m b/FreeOTP/TokenStore.m
index 1ca479b..397b650 100644
--- a/FreeOTP/TokenStore.m
+++ b/FreeOTP/TokenStore.m
@@ -24,12 +24,12 @@
 #define TOKEN_ORDER @"tokenOrder"
 
 static NSMutableArray*
-getTokenOrder(FXKeychain* def)
+getTokenOrder(FXKeychain* keychain)
 {
-    NSMutableArray* order = [NSMutableArray arrayWithArray:[def objectForKey:TOKEN_ORDER]];
+    NSMutableArray* order = [NSMutableArray arrayWithArray:[keychain objectForKey:TOKEN_ORDER]];
     if (order == nil) {
         order = [[NSMutableArray alloc] init];
-        [def setObject:order forKey:TOKEN_ORDER];
+        [keychain setObject:order forKey:TOKEN_ORDER];
     }
 
     return order;
@@ -37,24 +37,24 @@ getTokenOrder(FXKeychain* def)
 
 @implementation TokenStore
 {
-    FXKeychain* def;
+    FXKeychain* keychain;
 }
 
 - (id)init
 {
     self = [super init];
 
-    def = [FXKeychain defaultKeychain];
-    if (def == nil)
+    keychain = [FXKeychain defaultKeychain];
+    if (keychain == nil)
         return nil;
-    def.accessibility = FXKeychainAccessibleWhenUnlockedThisDeviceOnly;
+    keychain.accessibility = FXKeychainAccessibleWhenUnlockedThisDeviceOnly;
     
     return self;
 }
 
 - (NSUInteger)count
 {
-    NSMutableArray* order = getTokenOrder(def);
+    NSMutableArray* order = getTokenOrder(keychain);
     return order.count;
 }
 
@@ -65,30 +65,30 @@ getTokenOrder(FXKeychain* def)
 
 - (void)add:(Token*)token atIndex:(NSUInteger)index
 {
-    if ([def objectForKey:token.uid] != nil)
+    if ([keychain objectForKey:token.uid] != nil)
         return;
 
-    NSMutableArray* order = getTokenOrder(def);
+    NSMutableArray* order = getTokenOrder(keychain);
     [order insertObject:token.uid atIndex:index];
-    [def setObject:order forKey:TOKEN_ORDER];
-    [def setObject:token.description forKey:token.uid];
+    [keychain setObject:order forKey:TOKEN_ORDER];
+    [keychain setObject:token.description forKey:token.uid];
 }
 
 - (void)del:(NSUInteger)index
 {
-    NSMutableArray* order = getTokenOrder(def);
+    NSMutableArray* order = getTokenOrder(keychain);
     NSString* key = [order objectAtIndex:index];
     if (key == nil)
         return;
 
     [order removeObjectAtIndex:index];
-    [def setObject:order forKey:TOKEN_ORDER];
-    [def removeObjectForKey:key];
+    [keychain setObject:order forKey:TOKEN_ORDER];
+    [keychain removeObjectForKey:key];
 }
 
 - (Token*)get:(NSUInteger)index
 {
-    NSMutableArray* order = getTokenOrder(def);
+    NSMutableArray* order = getTokenOrder(keychain);
     if ([order count] < 1)
         return nil;
 
@@ -96,20 +96,20 @@ getTokenOrder(FXKeychain* def)
     if (key == nil)
         return nil;
     
-    return [[Token alloc] initWithString:[def objectForKey:key] internal:YES];
+    return [[Token alloc] initWithString:[keychain objectForKey:key] internal:YES];
 }
 
 - (void)save:(Token*)token
 {
-    if ([def objectForKey:token.uid] == nil)
+    if ([keychain objectForKey:token.uid] == nil)
         return;
 
-    [def setObject:token.description forKey:token.uid];
+    [keychain setObject:token.description forKey:token.uid];
 }
 
 - (void)moveFrom:(NSUInteger)fromIndex to:(NSUInteger)toIndex
 {
-    NSMutableArray* order = getTokenOrder(def);
+    NSMutableArray* order = getTokenOrder(keychain);
     NSString* key = [order objectAtIndex:fromIndex];
     if (key == nil)
         return;
@@ -117,6 +117,6 @@ getTokenOrder(FXKeychain* def)
     [order removeObjectAtIndex:fromIndex];
     [order insertObject:key atIndex:toIndex];
 
-    [def setObject:order forKey:TOKEN_ORDER];
+    [keychain setObject:order forKey:TOKEN_ORDER];
 }
 @end
-- 
2.3.0