Permalink
Browse files

Merge branch 'develop'

  • Loading branch information...
2 parents 33732f3 + 33f7a33 commit 5dd8eff4bf153e00f6f6d046ba7fa17166d40b08 @danielctull committed Feb 20, 2011
View
2 DTResurrectionKit.h
@@ -40,4 +40,4 @@
#import "UIViewController+DTResurrection.h"
#import "UINavigationController+DTResurrection.h"
#import "NSArray+DTResurrection.h"
-#import "NSDictionary+DTResurrection.h"
+#import "NSDictionary+DTResurrection.h"
View
4 DTResurrector.m
@@ -78,7 +78,7 @@ - (NSDictionary *)deconstructWithRootObject:(NSObject<DTResurrection> *)object {
- (void)setObject:(id)object forKey:(NSString *)aKey {
- NSMutableDictionary *parentObject = [encodingStack topObject];
+ NSMutableDictionary *parentObject = [encodingStack top];
if ([[objectDictionary allValues] containsObject:object]) { // To prevent infinite loop by two objects referencing each other.
@@ -160,7 +160,7 @@ - (id)resurrect:(NSDictionary *)aDictionary {
- (id)objectForKey:(NSString *)key {
- NSMutableDictionary *parentObject = [encodingStack topObject];
+ NSMutableDictionary *parentObject = [encodingStack top];
NSObject *object = [parentObject objectForKey:key];
View
2 NSArray+DTResurrection.m
@@ -31,7 +31,7 @@ - (void)encodeToResurrector:(DTResurrector *)resurrector {
[resurrector setObject:[NSNumber numberWithInt:[self count]] forKey:@"amount"];
- for (NSInteger i = 0; i < [self count]; i++)
+ for (NSUInteger i = 0; i < [self count]; i++)
[resurrector setObject:[self objectAtIndex:i] forKey:[NSString stringWithFormat:@"%i", i]];
}
View
2 NSDictionary+DTResurrection.m
@@ -31,7 +31,7 @@ - (void)encodeToResurrector:(DTResurrector *)resurrector {
[resurrector setObject:[NSNumber numberWithInt:[self count]] forKey:@"amount"];
- for (NSInteger i = 0; i < [self count]; i++) {
+ for (NSUInteger i = 0; i < [self count]; i++) {
id key = [[self allKeys] objectAtIndex:i];
[resurrector setObject:key forKey:[NSString stringWithFormat:@"key%i", i]];
[resurrector setObject:[self objectForKey:key] forKey:[NSString stringWithFormat:@"object%i", i]];
View
2 UINavigationController+DTResurrection.m
@@ -17,7 +17,7 @@ - (id)initWithResurrector:(DTResurrector *)resurrector {
if (!(self = [self initWithRootViewController:[vcs objectAtIndex:0]])) return nil;
- for (NSInteger i = 1; i < [vcs count]; i++)
+ for (NSUInteger i = 1; i < [vcs count]; i++)
[self pushViewController:[vcs objectAtIndex:i] animated:NO];
UIViewController *mvc = [resurrector objectForKey:@"modalViewController"];

0 comments on commit 5dd8eff

Please sign in to comment.