Minor cleanup and slight optimisation

schwa · Dec 27, 2013 · 31ee7d1 · 31ee7d1
1 parent a651427
commit 31ee7d1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 15 deletions.
diff --git a/NSObject+KVOBlock.h b/NSObject+KVOBlock.h
@@ -41,7 +41,5 @@ typedef void (^KVOFullBlock)(NSString *keyPath, id object, NSDictionary *change)
 /// One shot blocks remove themselves after they've been fired once.
 - (id)addOneShotKVOBlockForKeyPath:(NSString *)inKeyPath options:(NSKeyValueObservingOptions)inOptions handler:(KVOFullBlock)inHandler;
 
-- (void)KVODump;
-
 @end
 
diff --git a/NSObject+KVOBlock.m b/NSObject+KVOBlock.m
@@ -67,7 +67,7 @@ - (id)addKVOBlockForKeyPath:(NSString *)inKeyPath options:(NSKeyValueObservingOp
     NSParameterAssert(inKeyPath);
     NSParameterAssert([NSThread isMainThread]); // TODO -- remove and grow a pair.
 
-    CKVOBlockHelper *theHelper = [self helper:YES];
+    CKVOBlockHelper *theHelper = KVOBlockHelperForObject(self, YES);
 	NSParameterAssert(theHelper != NULL);
 
     CKVOToken *theToken = [theHelper insertNewTokenForKeyPath:inKeyPath block:inHandler];
@@ -84,7 +84,7 @@ - (id)addKVOBlockForKeyPath:(NSString *)inKeyPath options:(NSKeyValueObservingOp
 - (void)removeKVOBlockForToken:(CKVOToken *)inToken
     {
     NSParameterAssert([NSThread isMainThread]); // TODO -- remove and grow a pair.
-    CKVOBlockHelper *theHelper = [self helper:NO];
+    CKVOBlockHelper *theHelper = KVOBlockHelperForObject(self, NO);
     NSParameterAssert(theHelper != NULL);
 
     void *theContext = inToken.context;
@@ -110,22 +110,16 @@ - (id)addOneShotKVOBlockForKeyPath:(NSString *)inKeyPath options:(NSKeyValueObse
     return(theToken);
     }
 
-- (void)KVODump
-	{
-    CKVOBlockHelper *theHelper = [self helper:NO];
-	[theHelper dump];
-	}
-
 #pragma mark -
 
-- (CKVOBlockHelper *)helper:(BOOL)inCreate
-	{
-    CKVOBlockHelper *theHelper = objc_getAssociatedObject(self, &KVO);
+static CKVOBlockHelper *KVOBlockHelperForObject(NSObject *object, BOOL inCreate)
+    {
+    CKVOBlockHelper *theHelper = objc_getAssociatedObject(object, &KVO);
     if (theHelper == NULL && inCreate == YES)
         {
-        theHelper = [[CKVOBlockHelper alloc] initWithObject:self];
+        theHelper = [[CKVOBlockHelper alloc] initWithObject:object];
 
-        objc_setAssociatedObject(self, &KVO, theHelper, OBJC_ASSOCIATION_RETAIN);
+        objc_setAssociatedObject(object, &KVO, theHelper, OBJC_ASSOCIATION_RETAIN);
         }
     return(theHelper);
 	}