Use +[NSNumber numberWithBool:] in place of GRYes

tomaz · Jul 4, 2013 · 1e2cee9 · 1e2cee9
1 parent da6a1f6
commit 1e2cee9
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/Generating/GBDocSetOutputGenerator.m b/Generating/GBDocSetOutputGenerator.m
@@ -141,10 +141,10 @@ - (BOOL)processNodesXml:(NSError **)error {
 	NSMutableDictionary *vars = [NSMutableDictionary dictionary];
 	[vars setObject:self.settings.projectName forKey:@"projectName"];
 	[vars setObject:@"index.html" forKey:@"indexFilename"];
-	[vars setObject:([self.documents count] > 0) ? [GRYes yes] : [GRNo no] forKey:@"hasDocs"];
-	[vars setObject:([self.classes count] > 0) ? [GRYes yes] : [GRNo no] forKey:@"hasClasses"];
-	[vars setObject:([self.categories count] > 0) ? [GRYes yes] : [GRNo no] forKey:@"hasCategories"];
-	[vars setObject:([self.protocols count] > 0) ? [GRYes yes] : [GRNo no] forKey:@"hasProtocols"];
+	[vars setObject:[NSNumber numberWithBool:([self.documents count] > 0)] forKey:@"hasDocs"];
+	[vars setObject:[NSNumber numberWithBool:([self.classes count] > 0)] forKey:@"hasClasses"];
+	[vars setObject:[NSNumber numberWithBool:([self.categories count] > 0)] forKey:@"hasCategories"];
+	[vars setObject:[NSNumber numberWithBool:([self.protocols count] > 0)] forKey:@"hasProtocols"];
 	[vars setObject:self.documents forKey:@"docs"];
 	[vars setObject:self.classes forKey:@"classes"];
 	[vars setObject:self.categories forKey:@"categories"];
@@ -286,7 +286,7 @@ - (void)addTokensXmlModelObjectDataForObject:(GBModelBase *)object toData:(NSMut
 				}
 			}
 			if ([related count] > 0) {
-				[data setObject:[GRYes yes] forKey:@"hasRelatedTokens"];
+				[data setObject:[NSNumber numberWithBool:YES] forKey:@"hasRelatedTokens"];
 				[data setObject:related forKey:@"relatedTokens"];
 			}
 		}
@@ -305,7 +305,7 @@ - (void)addTokensXmlModelObjectDataForObject:(GBModelBase *)object toData:(NSMut
 					[arguments addObject:argData];
 				}
 				[data setObject:arguments forKey:@"parameters"];
-				[data setObject:[GRYes yes] forKey:@"hasParameters"];
+				[data setObject:[NSNumber numberWithBool:YES] forKey:@"hasParameters"];
 			}
 			if (method.comment.hasMethodResult) {
 				NSDictionary *resultData = [NSDictionary dictionaryWithObject:method.comment.methodResult forKey:@"abstract"];

diff --git a/Generating/GBHTMLTemplateVariablesProvider.m b/Generating/GBHTMLTemplateVariablesProvider.m
@@ -215,11 +215,11 @@ - (NSDictionary *)arrayDescriptorForArray:(NSArray *)array {
 	// Helps handling arrays in template by embedding two keys: "used" as boolean and "items" as the actual array (only if non-empty).
 	NSMutableDictionary *result = [NSMutableDictionary dictionary];
 	if ([array count] > 0) {
-		[result setObject:[GRYes yes] forKey:@"used"];
+		[result setObject:[NSNumber numberWithBool:YES] forKey:@"used"];
 		[result setObject:array forKey:@"values"];
 		return result;
 	}
-	[result setObject:[GRNo no] forKey:@"used"];
+	[result setObject:[NSNumber numberWithBool:NO] forKey:@"used"];
 	return result;
 }
 
@@ -525,7 +525,7 @@ - (NSArray *)arrayFromHierarchyLevel:(NSDictionary *)level {
 		NSMutableDictionary *classData = [NSMutableDictionary dictionary];
 		[classData setObject:name forKey:@"name"];
 		[classData setObject:subclasses forKey:@"classes"];
-		[classData setObject:[subclasses count] > 0 ? [GRYes yes] : [GRNo no] forKey:@"hasClasses"];
+		[classData setObject:[NSNumber numberWithBool:([subclasses count] > 0)] forKey:@"hasClasses"];
 		if (href) [classData setObject:href forKey:@"href"];
 		[result addObject:classData];
 	}];
@@ -539,12 +539,12 @@ - (void)registerObjectsUsageForIndexInDictionary:(NSMutableDictionary *)dict {
 	BOOL documents = [self.store.documents count] > 0;
 	BOOL classes = [self.store.classes count] > 0;
 	BOOL categories = [self.store.categories count] > 0;
-	BOOL protocols = [self.store.protocols count] > 0; 
-	[dict setObject:documents ? [GRYes yes] : [GRNo no] forKey:@"hasDocs"];
-	[dict setObject:classes ? [GRYes yes] : [GRNo no] forKey:@"hasClasses"];
-	[dict setObject:categories ? [GRYes yes] : [GRNo no] forKey:@"hasCategories"];
-	[dict setObject:protocols ? [GRYes yes] : [GRNo no] forKey:@"hasProtocols"];
-	[dict setObject:(protocols || categories) ? [GRYes yes] : [GRNo no] forKey:@"hasProtocolsOrCategories"];
+	BOOL protocols = [self.store.protocols count] > 0;
+    [dict setObject:[NSNumber numberWithBool:documents] forKey:@"hasDocs"];
+    [dict setObject:[NSNumber numberWithBool:classes] forKey:@"hasClasses"];
+	[dict setObject:[NSNumber numberWithBool:categories] forKey:@"hasCategories"];
+	[dict setObject:[NSNumber numberWithBool:protocols] forKey:@"hasProtocols"];
+	[dict setObject:[NSNumber numberWithBool:protocols || categories] forKey:@"hasProtocolsOrCategories"];
 }
 
 @end
diff --git a/Model/GBMethodData.m b/Model/GBMethodData.m
@@ -236,7 +236,7 @@ - (NSDictionary *)formattedComponentWithValue:(NSString *)value style:(NSUIntege
 	[result setObject:value forKey:@"value"];
 	if (style > 0) {
 		[result setObject:[NSNumber numberWithUnsignedInt:style] forKey:@"style"];
-		[result setObject:[GRYes yes] forKey:@"emphasized"];
+		[result setObject:[NSNumber numberWithBool:YES] forKey:@"emphasized"];
 	}
 	if (href) [result setObject:href forKey:@"href"];
 	return result;

diff --git a/Testing/GBObjectsAssertor.m b/Testing/GBObjectsAssertor.m
@@ -107,7 +107,7 @@ - (void)assertFormattedComponents:(NSArray *)components match:(NSString *)first,
 		[data setObject:value forKey:@"value"];
 		[data setObject:style forKey:@"style"];
 		[data setObject:href forKey:@"href"];
-		if ([style unsignedIntValue] == 1) [data setObject:[GRYes yes] forKey:@"emphasized"];
+		if ([style unsignedIntValue] == 1) [data setObject:[NSNumber numberWithBool:YES] forKey:@"emphasized"];
 		[arguments addObject:data];
 
 		value = va_arg(args, NSString *);