diff --git a/JSONKit.h b/JSONKit.h index 71bd0c3..865c1bc 100644 --- a/JSONKit.h +++ b/JSONKit.h @@ -95,6 +95,9 @@ typedef unsigned int NSUInteger; #ifndef _JSONKIT_H_ #define _JSONKIT_H_ +// You can define JK_REMOVE_DEPRECATED to remove all deprecated stuff +//#define JK_REMOVE_DEPRECATED + #if defined(__GNUC__) && (__GNUC__ >= 4) && defined(__APPLE_CC__) && (__APPLE_CC__ >= 5465) #define JK_DEPRECATED_ATTRIBUTE __attribute__((deprecated)) #else @@ -148,12 +151,14 @@ typedef struct JKParseState JKParseState; // Opaque internal, private type. - (id)initWithParseOptions:(JKParseOptionFlags)parseOptionFlags; - (void)clearCache; +#ifndef JK_REMOVE_DEPRECATED // The parse... methods were deprecated in v1.4 in favor of the v1.4 objectWith... methods. - (id)parseUTF8String:(const unsigned char *)string length:(size_t)length JK_DEPRECATED_ATTRIBUTE; // Deprecated in JSONKit v1.4. Use objectWithUTF8String:length: instead. - (id)parseUTF8String:(const unsigned char *)string length:(size_t)length error:(NSError **)error JK_DEPRECATED_ATTRIBUTE; // Deprecated in JSONKit v1.4. Use objectWithUTF8String:length:error: instead. // The NSData MUST be UTF8 encoded JSON. - (id)parseJSONData:(NSData *)jsonData JK_DEPRECATED_ATTRIBUTE; // Deprecated in JSONKit v1.4. Use objectWithData: instead. - (id)parseJSONData:(NSData *)jsonData error:(NSError **)error JK_DEPRECATED_ATTRIBUTE; // Deprecated in JSONKit v1.4. Use objectWithData:error: instead. +#endif // Methods that return immutable collection objects. - (id)objectWithUTF8String:(const unsigned char *)string length:(NSUInteger)length; diff --git a/JSONKit.m b/JSONKit.m index 0e9331f..f66359b 100644 --- a/JSONKit.m +++ b/JSONKit.m @@ -2203,6 +2203,7 @@ static id _JKParseUTF8String(JKParseState *parseState, BOOL mutableCollections, #pragma mark Deprecated as of v1.4 //////////// +#ifndef JK_REMOVE_DEPRECATED // Deprecated in JSONKit v1.4. Use objectWithUTF8String:length: instead. - (id)parseUTF8String:(const unsigned char *)string length:(size_t)length { @@ -2226,6 +2227,7 @@ - (id)parseJSONData:(NSData *)jsonData error:(NSError **)error { return([self objectWithData:jsonData error:error]); } +#endif //////////// #pragma mark Methods that return immutable collection objects