1 files changed, 21 insertions, 23 deletions

diff --git a/bindings/objc/src/SwordVerseKey.mm b/bindings/objc/src/SwordVerseKey.mm
index ca15f17..c745a9b 100644
--- a/bindings/objc/src/SwordVerseKey.mm
+++ b/bindings/objc/src/SwordVerseKey.mm
@@ -12,27 +12,27 @@
 @implementation SwordVerseKey
 
 + (SwordVerseKey *)verseKey {
-    return [[[SwordVerseKey alloc] init] autorelease];
+    return [[SwordVerseKey alloc] init];
 }
 
 + (SwordVerseKey *)verseKeyWithVersification:(NSString *)scheme {
-    return [[[SwordVerseKey alloc] initWithVersification:scheme] autorelease];
+    return [[SwordVerseKey alloc] initWithVersification:scheme];
 }
 
 + (SwordVerseKey *)verseKeyWithRef:(NSString *)aRef {
-    return [[[SwordVerseKey alloc] initWithRef:aRef] autorelease];
+    return [[SwordVerseKey alloc] initWithRef:aRef];
 }
 
 + (SwordVerseKey *)verseKeyWithRef:(NSString *)aRef v11n:(NSString *)scheme {
-    return [[[SwordVerseKey alloc] initWithRef:aRef v11n:scheme] autorelease];
+    return [[SwordVerseKey alloc] initWithRef:aRef v11n:scheme];
 }
 
 + (SwordVerseKey *)verseKeyWithSWVerseKey:(sword::VerseKey *)aVk {
-    return [[[SwordVerseKey alloc] initWithSWVerseKey:aVk] autorelease];
+    return [[SwordVerseKey alloc] initWithSWVerseKey:aVk];
 }
 
 + (SwordVerseKey *)verseKeyWithSWVerseKey:(sword::VerseKey *)aVk makeCopy:(BOOL)copy {
-    return [[[SwordVerseKey alloc] initWithSWVerseKey:aVk makeCopy:copy] autorelease];    
+    return [[SwordVerseKey alloc] initWithSWVerseKey:aVk makeCopy:copy];    
 }
 
 - (id)init {
@@ -60,48 +60,46 @@
 }
 
 - (SwordVerseKey *)initWithRef:(NSString *)aRef v11n:(NSString *)scheme {
-    sword::VerseKey *vk = new sword::VerseKey();            
-    self = [super initWithSWKey:vk];
+    sword::VerseKey vk;
+    self = [super initWithSWKey:&vk makeCopy:YES];
     if(self) {
         created = YES;
         if(scheme) {
             [self setVersification:scheme];
         }
-        
+
         if(aRef) {
             [self setKeyText:aRef];
-        }        
-    }    
+        }
+    }
     
     return self;
 }
 
-- (void)finalize {
-    [super finalize];
-}
 
-- (void)dealloc {
-    [super dealloc];    
-}
 
 - (SwordKey *)clone {
     return [SwordVerseKey verseKeyWithSWVerseKey:(sword::VerseKey *)sk];
 }
 
+- (long)index {
+    return ((sword::VerseKey *)sk)->getIndex();
+}
+
 - (BOOL)headings {
-    return (BOOL)((sword::VerseKey *)sk)->Headings();
+    return (BOOL)((sword::VerseKey *)sk)->isIntros();
 }
 
 - (void)setHeadings:(BOOL)flag {
-    ((sword::VerseKey *)sk)->Headings(flag);
+    ((sword::VerseKey *)sk)->setIntros(flag);
 }
 
 - (BOOL)autoNormalize {
-    return (BOOL)((sword::VerseKey *)sk)->AutoNormalize();
+    return (BOOL)((sword::VerseKey *)sk)->isAutoNormalize();
 }
 
 - (void)setAutoNormalize:(BOOL)flag {
-    ((sword::VerseKey *)sk)->AutoNormalize(flag);
+    ((sword::VerseKey *)sk)->setAutoNormalize(flag);
 }
 
 - (int)testament {
@@ -132,8 +130,8 @@
     ((sword::VerseKey *)sk)->setChapter(val);
 }
 
-- (void)setVerse:(int)val {
-    ((sword::VerseKey *)sk)->setVerse(val);
+- (void)setVerse:(long)val {
+    ((sword::VerseKey *)sk)->setVerse((int)val);
 }
 
 - (NSString *)bookName {