Prefix NSNumber XMPP category methods

Categories/NSNumber+XMPP.h

@@ -3,22 +3,44 @@
 
 @interface NSNumber (XMPP)
 
-+ (NSNumber *)numberWithPtr:(const void *)ptr;
-- (id)initWithPtr:(const void *)ptr;
++ (NSNumber *)xmpp_numberWithPtr:(const void *)ptr;
+- (id)xmpp_initWithPtr:(const void *)ptr __attribute__((objc_method_family(init)));
 
-+ (BOOL)parseString:(NSString *)str intoInt32:(int32_t *)pNum;
-+ (BOOL)parseString:(NSString *)str intoUInt32:(uint32_t *)pNum;
++ (BOOL)xmpp_parseString:(NSString *)str intoInt32:(int32_t *)pNum;
++ (BOOL)xmpp_parseString:(NSString *)str intoUInt32:(uint32_t *)pNum;
 
-+ (BOOL)parseString:(NSString *)str intoInt64:(int64_t *)pNum;
-+ (BOOL)parseString:(NSString *)str intoUInt64:(uint64_t *)pNum;
++ (BOOL)xmpp_parseString:(NSString *)str intoInt64:(int64_t *)pNum;
++ (BOOL)xmpp_parseString:(NSString *)str intoUInt64:(uint64_t *)pNum;
 
-+ (BOOL)parseString:(NSString *)str intoNSInteger:(NSInteger *)pNum;
-+ (BOOL)parseString:(NSString *)str intoNSUInteger:(NSUInteger *)pNum;
++ (BOOL)xmpp_parseString:(NSString *)str intoNSInteger:(NSInteger *)pNum;
++ (BOOL)xmpp_parseString:(NSString *)str intoNSUInteger:(NSUInteger *)pNum;
 
-+ (UInt8)extractUInt8FromData:(NSData *)data atOffset:(unsigned int)offset;
++ (UInt8)xmpp_extractUInt8FromData:(NSData *)data atOffset:(unsigned int)offset;
 
-+ (UInt16)extractUInt16FromData:(NSData *)data atOffset:(unsigned int)offset andConvertFromNetworkOrder:(BOOL)flag;
++ (UInt16)xmpp_extractUInt16FromData:(NSData *)data atOffset:(unsigned int)offset andConvertFromNetworkOrder:(BOOL)flag;
 
-+ (UInt32)extractUInt32FromData:(NSData *)data atOffset:(unsigned int)offset andConvertFromNetworkOrder:(BOOL)flag;
++ (UInt32)xmpp_extractUInt32FromData:(NSData *)data atOffset:(unsigned int)offset andConvertFromNetworkOrder:(BOOL)flag;
 
 @end
+
+#ifndef XMPP_EXCLUDE_DEPRECATED
+
+#define XMPP_DEPRECATED($message) __attribute__((deprecated($message)))
+
+@interface NSNumber (XMPPDeprecated)
++ (NSNumber *)numberWithPtr:(const void *)ptr XMPP_DEPRECATED("Use +xmpp_numberWithPtr:");
+- (id)initWithPtr:(const void *)ptr XMPP_DEPRECATED("Use -xmpp_initWithPtr:");
++ (BOOL)parseString:(NSString *)str intoInt32:(int32_t *)pNum XMPP_DEPRECATED("Use +xmpp_parseString:intoInt32:");
++ (BOOL)parseString:(NSString *)str intoUInt32:(uint32_t *)pNum XMPP_DEPRECATED("Use +xmpp_parseString:intoUInt32:");
++ (BOOL)parseString:(NSString *)str intoInt64:(int64_t *)pNum XMPP_DEPRECATED("Use +xmpp_parseString:intoInt64:");
++ (BOOL)parseString:(NSString *)str intoUInt64:(uint64_t *)pNum XMPP_DEPRECATED("Use +xmpp_parseString:intoUInt64:");
++ (BOOL)parseString:(NSString *)str intoNSInteger:(NSInteger *)pNum XMPP_DEPRECATED("Use +xmpp_parseString:intoNSInteger:");
++ (BOOL)parseString:(NSString *)str intoNSUInteger:(NSUInteger *)pNum XMPP_DEPRECATED("Use +xmpp_parseString:intoNSUInteger:");
++ (UInt8)extractUInt8FromData:(NSData *)data atOffset:(unsigned int)offset XMPP_DEPRECATED("Use +xmpp_extractUInt8FromData:atOffset:");
++ (UInt16)extractUInt16FromData:(NSData *)data atOffset:(unsigned int)offset andConvertFromNetworkOrder:(BOOL)flag XMPP_DEPRECATED("Use +xmpp_extractUInt16FromData:atOffset:andConvertFromNetworkOrder:");
++ (UInt32)extractUInt32FromData:(NSData *)data atOffset:(unsigned int)offset andConvertFromNetworkOrder:(BOOL)flag XMPP_DEPRECATED("Use +xmpp_extractUInt32FromData:atOffset:andConvertFromNetworkOrder:");
+@end
+
+#undef XMPP_DEPRECATED
+
+#endif

Categories/NSNumber+XMPP.m

@@ -7,17 +7,17 @@
 
 @implementation NSNumber (XMPP)
 
-+ (NSNumber *)numberWithPtr:(const void *)ptr
++ (NSNumber *)xmpp_numberWithPtr:(const void *)ptr
 {
-	return [[NSNumber alloc] initWithPtr:ptr];
+	return [[NSNumber alloc] xmpp_initWithPtr:ptr];
 }
 
-- (id)initWithPtr:(const void *)ptr
+- (id)xmpp_initWithPtr:(const void *)ptr
 {
 	return [self initWithLong:(long)ptr];
 }
 
-+ (BOOL)parseString:(NSString *)str intoInt32:(int32_t *)pNum
++ (BOOL)xmpp_parseString:(NSString *)str intoInt32:(int32_t *)pNum
 {
 	if (str == nil)
 	{
@@ -59,7 +59,7 @@ + (BOOL)parseString:(NSString *)str intoInt32:(int32_t *)pNum
 		return YES;
 }
 
-+ (BOOL)parseString:(NSString *)str intoUInt32:(uint32_t *)pNum
++ (BOOL)xmpp_parseString:(NSString *)str intoUInt32:(uint32_t *)pNum
 {
 	if (str == nil)
 	{
@@ -96,7 +96,7 @@ + (BOOL)parseString:(NSString *)str intoUInt32:(uint32_t *)pNum
 		return YES;
 }
 
-+ (BOOL)parseString:(NSString *)str intoInt64:(int64_t *)pNum
++ (BOOL)xmpp_parseString:(NSString *)str intoInt64:(int64_t *)pNum
 {
 	if (str == nil)
 	{
@@ -124,7 +124,7 @@ + (BOOL)parseString:(NSString *)str intoInt64:(int64_t *)pNum
 		return YES;
 }
 
-+ (BOOL)parseString:(NSString *)str intoUInt64:(uint64_t *)pNum
++ (BOOL)xmpp_parseString:(NSString *)str intoUInt64:(uint64_t *)pNum
 {
 	if (str == nil)
 	{
@@ -152,23 +152,23 @@ + (BOOL)parseString:(NSString *)str intoUInt64:(uint64_t *)pNum
 		return YES;
 }
 
-+ (BOOL)parseString:(NSString *)str intoNSInteger:(NSInteger *)pNum
++ (BOOL)xmpp_parseString:(NSString *)str intoNSInteger:(NSInteger *)pNum
 {
 	if (NSIntegerMax == INT32_MAX)
-		return [self parseString:str intoInt32:(int32_t *)pNum];
+		return [self xmpp_parseString:str intoInt32:(int32_t *)pNum];
 	else
-		return [self parseString:str intoInt64:(int64_t *)pNum];
+		return [self xmpp_parseString:str intoInt64:(int64_t *)pNum];
 }
 
-+ (BOOL)parseString:(NSString *)str intoNSUInteger:(NSUInteger *)pNum
++ (BOOL)xmpp_parseString:(NSString *)str intoNSUInteger:(NSUInteger *)pNum
 {
 	if (NSUIntegerMax == UINT32_MAX)
-		return [self parseString:str intoUInt32:(uint32_t *)pNum];
+		return [self xmpp_parseString:str intoUInt32:(uint32_t *)pNum];
 	else
-		return [self parseString:str intoUInt64:(uint64_t *)pNum];
+		return [self xmpp_parseString:str intoUInt64:(uint64_t *)pNum];
 }
 
-+ (UInt8)extractUInt8FromData:(NSData *)data atOffset:(unsigned int)offset
++ (UInt8)xmpp_extractUInt8FromData:(NSData *)data atOffset:(unsigned int)offset
 {
 	// 8 bits = 1 byte
 
@@ -180,7 +180,7 @@ + (UInt8)extractUInt8FromData:(NSData *)data atOffset:(unsigned int)offset
 	return result;
 }
 
-+ (UInt16)extractUInt16FromData:(NSData *)data atOffset:(unsigned int)offset andConvertFromNetworkOrder:(BOOL)flag
++ (UInt16)xmpp_extractUInt16FromData:(NSData *)data atOffset:(unsigned int)offset andConvertFromNetworkOrder:(BOOL)flag
 {
 	// 16 bits = 2 bytes
 
@@ -195,7 +195,7 @@ + (UInt16)extractUInt16FromData:(NSData *)data atOffset:(unsigned int)offset and
 		return result;
 }
 
-+ (UInt32)extractUInt32FromData:(NSData *)data atOffset:(unsigned int)offset andConvertFromNetworkOrder:(BOOL)flag
++ (UInt32)xmpp_extractUInt32FromData:(NSData *)data atOffset:(unsigned int)offset andConvertFromNetworkOrder:(BOOL)flag
 {
 	// 32 bits = 4 bytes
 
@@ -211,3 +211,55 @@ + (UInt32)extractUInt32FromData:(NSData *)data atOffset:(unsigned int)offset and
 }
 
 @end
+
+#ifndef XMPP_EXCLUDE_DEPRECATED
+
+@implementation NSNumber (XMPPDeprecated)
+
++ (NSNumber *)numberWithPtr:(const void *)ptr {
+    return [self xmpp_numberWithPtr:ptr];
+}
+
+- (id)initWithPtr:(const void *)ptr {
+    return [self xmpp_initWithPtr:ptr];
+}
+
++ (BOOL)parseString:(NSString *)str intoInt32:(int32_t *)pNum {
+    return [self xmpp_parseString:str intoInt32:pNum];
+}
+
++ (BOOL)parseString:(NSString *)str intoUInt32:(uint32_t *)pNum {
+    return [self xmpp_parseString:str intoUInt32:pNum];
+}
+
++ (BOOL)parseString:(NSString *)str intoInt64:(int64_t *)pNum {
+    return [self xmpp_parseString:str intoInt64:pNum];
+}
+
++ (BOOL)parseString:(NSString *)str intoUInt64:(uint64_t *)pNum {
+    return [self xmpp_parseString:str intoUInt64:pNum];
+}
+
++ (BOOL)parseString:(NSString *)str intoNSInteger:(NSInteger *)pNum {
+    return [self xmpp_parseString:str intoNSInteger:pNum];
+}
+
++ (BOOL)parseString:(NSString *)str intoNSUInteger:(NSUInteger *)pNum {
+    return [self xmpp_parseString:str intoNSUInteger:pNum];
+}
+
++ (UInt8)extractUInt8FromData:(NSData *)data atOffset:(unsigned int)offset {
+    return [self xmpp_extractUInt8FromData:data atOffset:offset];
+}
+
++ (UInt16)extractUInt16FromData:(NSData *)data atOffset:(unsigned int)offset andConvertFromNetworkOrder:(BOOL)flag {
+    return [self xmpp_extractUInt16FromData:data atOffset:offset andConvertFromNetworkOrder:flag];
+}
+
++ (UInt32)extractUInt32FromData:(NSData *)data atOffset:(unsigned int)offset andConvertFromNetworkOrder:(BOOL)flag {
+    return [self xmpp_extractUInt32FromData:data atOffset:offset andConvertFromNetworkOrder:flag];
+}
+
+@end
+
+#endif

Categories/NSXMLElement+XMPP.m

@@ -204,37 +204,37 @@ - (double)attributeDoubleValueForName:(NSString *)name
 - (int32_t)attributeInt32ValueForName:(NSString *)name
 {
 	int32_t result = 0;
-	[NSNumber parseString:[self attributeStringValueForName:name] intoInt32:&result];
+	[NSNumber xmpp_parseString:[self attributeStringValueForName:name] intoInt32:&result];
 	return result;
 }
 - (uint32_t)attributeUInt32ValueForName:(NSString *)name
 {
 	uint32_t result = 0;
-	[NSNumber parseString:[self attributeStringValueForName:name] intoUInt32:&result];
+	[NSNumber xmpp_parseString:[self attributeStringValueForName:name] intoUInt32:&result];
 	return result;
 }
 - (int64_t)attributeInt64ValueForName:(NSString *)name
 {
 	int64_t result;
-	[NSNumber parseString:[self attributeStringValueForName:name] intoInt64:&result];
+	[NSNumber xmpp_parseString:[self attributeStringValueForName:name] intoInt64:&result];
 	return result;
 }
 - (uint64_t)attributeUInt64ValueForName:(NSString *)name
 {
 	uint64_t result;
-	[NSNumber parseString:[self attributeStringValueForName:name] intoUInt64:&result];
+	[NSNumber xmpp_parseString:[self attributeStringValueForName:name] intoUInt64:&result];
 	return result;
 }
 - (NSInteger)attributeIntegerValueForName:(NSString *)name
 {
 	NSInteger result;
-	[NSNumber parseString:[self attributeStringValueForName:name] intoNSInteger:&result];
+	[NSNumber xmpp_parseString:[self attributeStringValueForName:name] intoNSInteger:&result];
 	return result;
 }
 - (NSUInteger)attributeUnsignedIntegerValueForName:(NSString *)name
 {
 	NSUInteger result = 0;
-	[NSNumber parseString:[self attributeStringValueForName:name] intoNSUInteger:&result];
+	[NSNumber xmpp_parseString:[self attributeStringValueForName:name] intoNSUInteger:&result];
 	return result;
 }
 - (NSString *)attributeStringValueForName:(NSString *)name
@@ -362,47 +362,47 @@ - (double)stringValueAsDouble
 - (int32_t)stringValueAsInt32
 {
 	int32_t result;
-	if ([NSNumber parseString:[self stringValue] intoInt32:&result])
+	if ([NSNumber xmpp_parseString:[self stringValue] intoInt32:&result])
 		return result;
 	else
 		return 0;
 }
 - (uint32_t)stringValueAsUInt32
 {
 	uint32_t result;
-	if ([NSNumber parseString:[self stringValue] intoUInt32:&result])
+	if ([NSNumber xmpp_parseString:[self stringValue] intoUInt32:&result])
 		return result;
 	else
 		return 0;
 }
 - (int64_t)stringValueAsInt64
 {
 	int64_t result = 0;
-	if ([NSNumber parseString:[self stringValue] intoInt64:&result])
+	if ([NSNumber xmpp_parseString:[self stringValue] intoInt64:&result])
 		return result;
 	else
 		return 0;
 }
 - (uint64_t)stringValueAsUInt64
 {
 	uint64_t result = 0;
-	if ([NSNumber parseString:[self stringValue] intoUInt64:&result])
+	if ([NSNumber xmpp_parseString:[self stringValue] intoUInt64:&result])
 		return result;
 	else
 		return 0;
 }
 - (NSInteger)stringValueAsNSInteger
 {
 	NSInteger result = 0;
-	if ([NSNumber parseString:[self stringValue] intoNSInteger:&result])
+	if ([NSNumber xmpp_parseString:[self stringValue] intoNSInteger:&result])
 		return result;
 	else
 		return 0;
 }
 - (NSUInteger)stringValueAsNSUInteger
 {
 	NSUInteger result = 0;
-	if ([NSNumber parseString:[self stringValue] intoNSUInteger:&result])
+	if ([NSNumber xmpp_parseString:[self stringValue] intoNSUInteger:&result])
 		return result;
 	else
 		return 0;

Extensions/CoreDataStorage/XMPPCoreDataStorage.m

@@ -352,7 +352,7 @@ - (XMPPJID *)myJIDForXMPPStream:(XMPPStream *)stream
 
 	dispatch_block_t block = ^{ @autoreleasepool {
 
-		NSNumber *key = [NSNumber numberWithPtr:(__bridge void *)stream];
+		NSNumber *key = [NSNumber xmpp_numberWithPtr:(__bridge void *)stream];
 
 		result = (XMPPJID *)[myJidCache objectForKey:key];
 		if (!result)
@@ -389,7 +389,7 @@ - (void)updateJidCache:(NSNotification *)notification
 
 	dispatch_block_t block = ^{ @autoreleasepool {
 
-		NSNumber *key = [NSNumber numberWithPtr:(__bridge void *)stream];
+		NSNumber *key = [NSNumber xmpp_numberWithPtr:(__bridge void *)stream];
 		XMPPJID *cachedJID = [myJidCache objectForKey:key];
 
 		if (cachedJID)

Extensions/Roster/CoreDataStorage/XMPPRosterCoreDataStorage.m

@@ -280,7 +280,7 @@ - (void)beginRosterPopulationForXMPPStream:(XMPPStream *)stream
 
 	[self scheduleBlock:^{
 
-		[rosterPopulationSet addObject:[NSNumber numberWithPtr:(__bridge void *)stream]];
+		[rosterPopulationSet addObject:[NSNumber xmpp_numberWithPtr:(__bridge void *)stream]];
 
 		// Clear anything already in the roster core data store.
 		// 
@@ -322,7 +322,7 @@ - (void)endRosterPopulationForXMPPStream:(XMPPStream *)stream
 
 	[self scheduleBlock:^{
 
-		[rosterPopulationSet removeObject:[NSNumber numberWithPtr:(__bridge void *)stream]];
+		[rosterPopulationSet removeObject:[NSNumber xmpp_numberWithPtr:(__bridge void *)stream]];
 	}];
 }
 
@@ -338,7 +338,7 @@ - (void)handleRosterItem:(NSXMLElement *)itemSubElement xmppStream:(XMPPStream *
 
 		NSManagedObjectContext *moc = [self managedObjectContext];
 
-		if ([rosterPopulationSet containsObject:[NSNumber numberWithPtr:(__bridge void *)stream]])
+		if ([rosterPopulationSet containsObject:[NSNumber xmpp_numberWithPtr:(__bridge void *)stream]])
 		{
 			NSString *streamBareJidStr = [[self myJIDForXMPPStream:stream] bare];
 

Extensions/XEP-0016/XMPPPrivacy.m

@@ -539,10 +539,10 @@ NSInteger sortItems(id itemOne, id itemTwo, void *context)
 	NSString *orderStr2 = [item2 attributeStringValueForName:@"order"];
 
 	NSUInteger order1;
-	BOOL parse1 = [NSNumber parseString:orderStr1 intoNSUInteger:&order1];
+	BOOL parse1 = [NSNumber xmpp_parseString:orderStr1 intoNSUInteger:&order1];
 
 	NSUInteger order2;
-	BOOL parse2 = [NSNumber parseString:orderStr2 intoNSUInteger:&order2];
+	BOOL parse2 = [NSNumber xmpp_parseString:orderStr2 intoNSUInteger:&order2];
 
 	if (parse1)
 	{