Browse files

fixes warning with using new in namespace

  • Loading branch information...
1 parent 8e67218 commit a10da3650c623ee22227faafad83e90954f36ed3 @steipete committed Sep 24, 2011
Showing with 11 additions and 11 deletions.
  1. +11 −11 Utils/SafeFetchedResultsController.m
View
22 Utils/SafeFetchedResultsController.m
@@ -64,13 +64,13 @@ @interface SafeObjectChange : NSObject
id object;
NSIndexPath *indexPath;
NSFetchedResultsChangeType changeType;
- NSIndexPath *newIndexPath;
+ NSIndexPath *updatedIndexPath;
}
@property (nonatomic, retain) id object;
@property (nonatomic, retain) NSIndexPath *indexPath;
@property (nonatomic, assign) NSFetchedResultsChangeType changeType;
-@property (nonatomic, retain) NSIndexPath *newIndexPath;
+@property (nonatomic, retain) NSIndexPath *updatedIndexPath;
- (id)initWithObject:(id)object
indexPath:(NSIndexPath *)indexPath
@@ -262,7 +262,7 @@ - (void)fixUpdateBugs
for (SafeObjectChange *objectChange in insertedObjects)
{
- [self addIndexPath:objectChange.newIndexPath toDictionary:objectInsertDict];
+ [self addIndexPath:objectChange.updatedIndexPath toDictionary:objectInsertDict];
}
for (SafeObjectChange *objectChange in deletedObjects)
{
@@ -271,7 +271,7 @@ - (void)fixUpdateBugs
for (SafeObjectChange *objectChange in movedObjects)
{
[self addIndexPath:objectChange.indexPath toDictionary:objectDeleteDict];
- [self addIndexPath:objectChange.newIndexPath toDictionary:objectInsertDict];
+ [self addIndexPath:objectChange.updatedIndexPath toDictionary:objectInsertDict];
}
for (SafeObjectChange *objectChange in updatedObjects)
@@ -281,7 +281,7 @@ - (void)fixUpdateBugs
DDLogInfo(@"Processing %@", objectChange);
}
- if (objectChange.newIndexPath == nil)
+ if (objectChange.updatedIndexPath == nil)
{
NSIndexPath *indexPath = objectChange.indexPath;
@@ -330,7 +330,7 @@ - (void)fixUpdateBugs
if (numChangedSections > 0 || numChangedObjects > 0)
{
- objectChange.newIndexPath = objectChange.indexPath;
+ objectChange.updatedIndexPath = objectChange.indexPath;
}
}
}
@@ -386,7 +386,7 @@ - (void)notifyDelegateOfObjectChange:(SafeObjectChange *)objectChange
didChangeObject:objectChange.object
atIndexPath:objectChange.indexPath
forChangeType:objectChange.changeType
- newIndexPath:objectChange.newIndexPath];
+ newIndexPath:objectChange.updatedIndexPath];
}
}
@@ -620,7 +620,7 @@ @implementation SafeObjectChange
@synthesize object;
@synthesize indexPath;
@synthesize changeType;
-@synthesize newIndexPath;
+@synthesize updatedIndexPath;
- (id)initWithObject:(id)anObject
indexPath:(NSIndexPath *)anIndexPath
@@ -632,7 +632,7 @@ - (id)initWithObject:(id)anObject
self.object = anObject;
self.indexPath = anIndexPath;
self.changeType = aChangeType;
- self.newIndexPath = aNewIndexPath;
+ self.updatedIndexPath = aNewIndexPath;
}
return self;
}
@@ -662,14 +662,14 @@ - (NSString *)description
return [NSString stringWithFormat:@"<SafeObjectChange changeType(%@) indexPath(%@) newIndexPath(%@)>",
[self changeTypeString],
[self stringFromIndexPath:indexPath],
- [self stringFromIndexPath:newIndexPath]];
+ [self stringFromIndexPath:updatedIndexPath]];
}
- (void)dealloc
{
self.object = nil;
self.indexPath = nil;
- self.newIndexPath = nil;
+ self.updatedIndexPath = nil;
[super dealloc];
}

0 comments on commit a10da36

Please sign in to comment.