1 files changed, 10 insertions, 27 deletions

diff --git a/bindings/objc/src/SwordDictionary.mm b/bindings/objc/src/SwordDictionary.mm
index 4924d00..13d5967 100644
--- a/bindings/objc/src/SwordDictionary.mm
+++ b/bindings/objc/src/SwordDictionary.mm
@@ -15,7 +15,7 @@
 
 @interface SwordDictionary (/* Private, class continuation */)
 /** private property */
-@property(readwrite, retain) NSMutableArray *keys;
+@property(readwrite, strong) NSMutableArray *keys;
 @end
 
 @interface SwordDictionary (PrivateAPI)
@@ -40,17 +40,17 @@
 	if([keys count] == 0) {
         NSMutableArray *arr = [NSMutableArray array];
 
-        [moduleLock lock];
+        [self.moduleLock lock];
         
         swModule->setSkipConsecutiveLinks(true);
         *swModule = sword::TOP;
         swModule->getRawEntry();        
         while(![self error]) {
-            char *cStrKeyText = (char *)swModule->KeyText();
+            char *cStrKeyText = (char *)swModule->getKeyText();
             if(cStrKeyText) {
                 NSString *keyText = [NSString stringWithUTF8String:cStrKeyText];
                 if(!keyText) {
-                    keyText = [NSString stringWithCString:swModule->KeyText() encoding:NSISOLatin1StringEncoding];
+                    keyText = [NSString stringWithCString:swModule->getKeyText() encoding:NSISOLatin1StringEncoding];
                     if(!keyText) {
                         ALog(@"Unable to create NSString instance from string: %s", cStrKeyText);
                     }
@@ -66,7 +66,7 @@
             (*swModule)++;
         }
 
-        [moduleLock unlock];
+        [self.moduleLock unlock];
         
         self.keys = arr;        
         [self writeToCache];
@@ -96,18 +96,9 @@
 
 @synthesize keys;
 
-- (id)initWithName:(NSString *)aName swordManager:(SwordManager *)aManager {    
-	self = [super initWithName:aName swordManager:aManager];
-    if(self) {
-        self.keys = nil;
-    }
-    	
-	return self;
-}
-
 /** init with given SWModule */
 - (id)initWithSWModule:(sword::SWModule *)aModule swordManager:(SwordManager *)aManager {
-    self = [super initWithSWModule:aModule swordManager:aManager];
+    self = [super initWithSWModule:aModule];
     if(self) {
         self.keys = nil;
     }
@@ -115,15 +106,7 @@
     return self;
 }
 
-- (void)finalize {
-	[super finalize];
-}
 
-- (void)dealloc {
-    [self setKeys:nil];
-    
-    [super dealloc];
-}
 
 - (NSArray *)allKeys {
     NSArray *ret = self.keys;
@@ -141,14 +124,14 @@
 - (NSString *)entryForKey:(NSString *)aKey {
     NSString *ret = nil;
     
-	[moduleLock lock];	
+	[self.moduleLock lock];
     [self setKeyString:aKey];    
 	if([self error]) {
         ALog(@"Error on setting key!");
     } else {
         ret = [self strippedText];
     }
-	[moduleLock unlock];
+	[self.moduleLock unlock];
 	
 	return ret;
 }
@@ -160,13 +143,13 @@
 - (id)attributeValueForParsedLinkData:(NSDictionary *)data withTextRenderType:(TextPullType)textType {
     id ret = nil;
     
-    NSString *attrType = [data objectForKey:ATTRTYPE_TYPE];
+    NSString *attrType = data[ATTRTYPE_TYPE];
     if([attrType isEqualToString:@"scriptRef"] || 
        [attrType isEqualToString:@"scripRef"] ||
        [attrType isEqualToString:@"Greek"] ||
        [attrType isEqualToString:@"Hebrew"] ||
        [attrType hasPrefix:@"strongMorph"] || [attrType hasPrefix:@"robinson"]) {
-        NSString *key = [data objectForKey:ATTRTYPE_VALUE];
+        NSString *key = data[ATTRTYPE_VALUE];
         ret = [self strippedTextEntriesForRef:key];
     }