Rename more methods to be more consistent.

mikeabdullah · Dec 5, 2010 · e41fa07 · e41fa07
1 parent d03d908
commit e41fa07
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 24 deletions.
diff --git a/Asynchronous/NSManagedObjectContext+DCTAsynchronousDataFetching.m b/Asynchronous/NSManagedObjectContext+DCTAsynchronousDataFetching.m
@@ -99,8 +99,8 @@ - (void)dct_asynchronousObjectsForEntityName:(NSString *)entityName
 														 sortDescriptors:sortDescriptors
 															   batchSize:batchSize];
 
-	[self dct_asynchronousFetch:request
-			  WithCallbackBlock:callbackBlock];
+	[self dct_asynchronousFetchRequest:request
+					 withCallbackBlock:callbackBlock];
 
 	[request release];	
 }

diff --git a/Asynchronous/NSManagedObjectContext+DCTAsynchronousTasks.h b/Asynchronous/NSManagedObjectContext+DCTAsynchronousTasks.h
@@ -42,20 +42,20 @@ typedef void (^DCTFetchRequestObjectCallbackBlock) (id fetchedObject, NSError *e
 
 @interface NSManagedObjectContext (DCTAsynchronousTasks)
 
-- (void)dct_asynchronousTaskWithWorkBlock:(DCTManagedObjectContextBlock)block;
+- (void)dct_asynchronousTaskWithWorkBlock:(DCTManagedObjectContextBlock)workBlock;
 
-- (void)dct_asynchronousTaskWithWorkBlock:(DCTManagedObjectContextBlock)block
-							   completionBlock:(DCTManagedObjectContextBlock)completionBlock;
+- (void)dct_asynchronousTaskWithWorkBlock:(DCTManagedObjectContextBlock)workBlock
+						  completionBlock:(DCTManagedObjectContextBlock)completionBlock;
 
-- (void)dct_asynchronousOperationWithCallbackQueue:(dispatch_queue_t)queue
-										 workBlock:(DCTManagedObjectContextBlock)block;
+- (void)dct_asynchronousTaskWithCallbackQueue:(dispatch_queue_t)queue
+									workBlock:(DCTManagedObjectContextBlock)workBlock;
 
-- (void)dct_asynchronousOperationWithCallbackQueue:(dispatch_queue_t)queue
-										 workBlock:(DCTManagedObjectContextBlock)block
-								   completionBlock:(DCTManagedObjectContextBlock)completionBlock;
+- (void)dct_asynchronousTaskWithCallbackQueue:(dispatch_queue_t)queue
+									workBlock:(DCTManagedObjectContextBlock)workBlock
+							  completionBlock:(DCTManagedObjectContextBlock)completionBlock;
 
-- (void)dct_asynchronousFetch:(NSFetchRequest *)fetchRequest
-			WithCallbackBlock:(DCTFetchRequestCallbackBlock)callbackBlock;
+- (void)dct_asynchronousFetchRequest:(NSFetchRequest *)fetchRequest
+				   withCallbackBlock:(DCTFetchRequestCallbackBlock)callbackBlock;
 
 - (void)dct_asynchronousFetchRequest:(NSFetchRequest *)fetchRequest
 				   withCallbackQueue:(dispatch_queue_t)callbackQueue

diff --git a/Asynchronous/NSManagedObjectContext+DCTAsynchronousTasks.m b/Asynchronous/NSManagedObjectContext+DCTAsynchronousTasks.m
@@ -48,35 +48,35 @@ @implementation NSManagedObjectContext (DCTAsynchronousTasks)
 #pragma mark Modification methods
 
 
-- (void)dct_asynchronousTaskWithWorkBlock:(DCTManagedObjectContextBlock)block {
-	[self dct_asynchronousTaskWithWorkBlock:block completionBlock:nil];
+- (void)dct_asynchronousTaskWithWorkBlock:(DCTManagedObjectContextBlock)workBlock {
+	[self dct_asynchronousTaskWithWorkBlock:workBlock completionBlock:nil];
 }
 
 
 
 
-- (void)dct_asynchronousTaskWithWorkBlock:(DCTManagedObjectContextBlock)block
+- (void)dct_asynchronousTaskWithWorkBlock:(DCTManagedObjectContextBlock)workBlock
 							   completionBlock:(DCTManagedObjectContextBlock)completionBlock {
 
 	if ([self dctInternal_raiseExceptionIfNotMainThread]) return;
 
-	[self dct_asynchronousOperationWithCallbackQueue:dispatch_get_main_queue() workBlock:block completionBlock:completionBlock];
+	[self dct_asynchronousTaskWithCallbackQueue:dispatch_get_main_queue() workBlock:workBlock completionBlock:completionBlock];
 }
 
 
 
 
-- (void)dct_asynchronousOperationWithCallbackQueue:(dispatch_queue_t)queue
-										 workBlock:(DCTManagedObjectContextBlock)block {
+- (void)dct_asynchronousTaskWithCallbackQueue:(dispatch_queue_t)queue
+										 workBlock:(DCTManagedObjectContextBlock)workBlock {
 
-	[self dct_asynchronousOperationWithCallbackQueue:queue workBlock:block completionBlock:nil];
+	[self dct_asynchronousTaskWithCallbackQueue:queue workBlock:workBlock completionBlock:nil];
 }
 
 
 
 
-- (void)dct_asynchronousOperationWithCallbackQueue:(dispatch_queue_t)queue
-										 workBlock:(DCTManagedObjectContextBlock)block
+- (void)dct_asynchronousTaskWithCallbackQueue:(dispatch_queue_t)queue
+										 workBlock:(DCTManagedObjectContextBlock)workBlock
 								   completionBlock:(DCTManagedObjectContextBlock)completionBlock {
 
 	NSManagedObjectContext *threadedContext = [[NSManagedObjectContext alloc] init];
@@ -86,7 +86,7 @@ - (void)dct_asynchronousOperationWithCallbackQueue:(dispatch_queue_t)queue
 
 	dispatch_async(asyncQueue, ^{
 
-		block(threadedContext);
+		workBlock(threadedContext);
 
 		dispatch_async(queue, ^{
 
@@ -113,8 +113,8 @@ - (void)dct_asynchronousOperationWithCallbackQueue:(dispatch_queue_t)queue
 #pragma mark -
 #pragma mark Fetch methods
 
-- (void)dct_asynchronousFetch:(NSFetchRequest *)fetchRequest
-			WithCallbackBlock:(DCTFetchRequestCallbackBlock)callbackBlock {
+- (void)dct_asynchronousFetchRequest:(NSFetchRequest *)fetchRequest
+				   withCallbackBlock:(DCTFetchRequestCallbackBlock)callbackBlock {
 
 	if ([self dctInternal_raiseExceptionIfNotMainThread]) return;