summaryrefslogtreecommitdiff
path: root/bindings/objc/src/VerseEnumerator.mm
diff options
context:
space:
mode:
Diffstat (limited to 'bindings/objc/src/VerseEnumerator.mm')
-rw-r--r--bindings/objc/src/VerseEnumerator.mm13
1 files changed, 3 insertions, 10 deletions
diff --git a/bindings/objc/src/VerseEnumerator.mm b/bindings/objc/src/VerseEnumerator.mm
index cd5c665..e7fc44d 100644
--- a/bindings/objc/src/VerseEnumerator.mm
+++ b/bindings/objc/src/VerseEnumerator.mm
@@ -10,7 +10,7 @@
#import "SwordListKey.h"
@interface VerseEnumerator ()
-@property (retain, readwrite) SwordListKey *listKey;
+@property (strong, readwrite) SwordListKey *listKey;
@end
@implementation VerseEnumerator
@@ -26,18 +26,11 @@
return self;
}
-- (void)finalize {
- [super finalize];
-}
-- (void)dealloc {
- [listKey release];
- [super dealloc];
-}
- (NSArray *)allObjects {
NSMutableArray *t = [NSMutableArray array];
- for(*[listKey swListKey] = sword::TOP;![listKey swListKey]->Error(); *[listKey swListKey] += 1) {
+ for(*[listKey swListKey] = sword::TOP;![listKey swListKey]->popError(); *[listKey swListKey] += 1) {
[t addObject:[listKey keyText]];
}
// position TOP again
@@ -48,7 +41,7 @@
- (NSString *)nextObject {
NSString *ret = nil;
- if(![listKey swListKey]->Error()) {
+ if(![listKey swListKey]->popError()) {
ret = [listKey keyText];
*[listKey swListKey] += 1;
}