diff --git a/CHANGELOG.md b/CHANGELOG.md index a23cefd..4261b3a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,8 +24,8 @@ **IMPORTANT:** The `^` block MUST return an object with a class that can be serialized by JSONKit, otherwise the serialization will fail. 
-    ​- (NSData \*)JSONDataWithOptions:(JKSerializeOptionFlags)serializeOptions serializeUnsupportedClassesUsingDelegate:(id)delegate selector:(SEL)selector error:(NSError \*\*)error;
-    ​- (NSString \*)JSONStringWithOptions:(JKSerializeOptionFlags)serializeOptions serializeUnsupportedClassesUsingDelegate:(id)delegate selector:(SEL)selector error:(NSError \*\*)error;
+    ​- (NSData *)JSONDataWithOptions:(JKSerializeOptionFlags)serializeOptions serializeUnsupportedClassesUsingDelegate:(id)delegate selector:(SEL)selector error:(NSError **)error;
+    ​- (NSString *)JSONStringWithOptions:(JKSerializeOptionFlags)serializeOptions serializeUnsupportedClassesUsingDelegate:(id)delegate selector:(SEL)selector error:(NSError **)error;
To serialize NSArray or NSDictionary objects using a `^` block– @@ -34,15 +34,15 @@ **IMPORTANT:** The `^` block MUST return an object with a class that can be serialized by JSONKit, otherwise the serialization will fail. 
-    ​- (NSData \*)JSONDataWithOptions:(JKSerializeOptionFlags)serializeOptions serializeUnsupportedClassesUsingBlock:(id(^)(id object))block error:(NSError \*\*)error;
-    ​- (NSString \*)JSONStringWithOptions:(JKSerializeOptionFlags)serializeOptions serializeUnsupportedClassesUsingBlock:(id(^)(id object))block error:(NSError \*\*)error;
+    ​- (NSData *)JSONDataWithOptions:(JKSerializeOptionFlags)serializeOptions serializeUnsupportedClassesUsingBlock:(id(^)(id object))block error:(NSError **)error;
+    ​- (NSString *)JSONStringWithOptions:(JKSerializeOptionFlags)serializeOptions serializeUnsupportedClassesUsingBlock:(id(^)(id object))block error:(NSError **)error;
Example using the delegate way: 
     @interface MYFormatter : NSObject {
-      NSDateFormatter \*outputFormatter;
+      NSDateFormatter *outputFormatter;
     }
     @end
     ​
@@ -69,10 +69,10 @@
     @end
     ​
     {
-      MYFormatter \*myFormatter = [[[MYFormatter alloc] init] autorelease];
-      NSArray \*array = [NSArray arrayWithObject:[NSDate dateWithTimeIntervalSinceNow:0.0]];
+      MYFormatter *myFormatter = [[[MYFormatter alloc] init] autorelease];
+      NSArray *array = [NSArray arrayWithObject:[NSDate dateWithTimeIntervalSinceNow:0.0]];
 
-      NSString \*jsonString = NULL;
+      NSString *jsonString = NULL;
       jsonString = [array                    JSONStringWithOptions:JKSerializeOptionNone
                           serializeUnsupportedClassesUsingDelegate:myFormatter
                                                           selector:@selector(formatObject:)
@@ -86,7 +86,7 @@
     
     
     {
-      NSDateFormatter \*outputFormatter = [[[NSDateFormatter alloc] init] autorelease];
+      NSDateFormatter *outputFormatter = [[[NSDateFormatter alloc] init] autorelease];
       [outputFormatter setDateFormat:@"yyyy-MM-dd'T'HH:mm:ss.SSSZZZ"];
       ​
       jsonString = [array                 JSONStringWithOptions:encodeOptions
@@ -121,10 +121,10 @@
 *   The following `JSONDecoder` methods are deprecated beginning with JSONKit v1.4 and will be removed in a later release–
     
     
-    ​- (id)parseUTF8String:(const unsigned char \*)string length:(size_t)length;
-    ​- (id)parseUTF8String:(const unsigned char \*)string length:(size_t)length error:(NSError \*\*)error;
-    ​- (id)parseJSONData:(NSData \*)jsonData;
-    ​- (id)parseJSONData:(NSData \*)jsonData error:(NSError \*\*)error;
+    ​- (id)parseUTF8String:(const unsigned char *)string length:(size_t)length;
+    ​- (id)parseUTF8String:(const unsigned char *)string length:(size_t)length error:(NSError **)error;
+    ​- (id)parseJSONData:(NSData *)jsonData;
+    ​- (id)parseJSONData:(NSData *)jsonData error:(NSError **)error;
     

     
     The JSONKit v1.4 objectWith… methods should be used instead.
@@ -136,19 +136,19 @@
     These methods replace their deprecated parse… counterparts and return immutable collection objects.
     
     
-    ​- (id)objectWithUTF8String:(const unsigned char \*)string length:(NSUInteger)length;
-    ​- (id)objectWithUTF8String:(const unsigned char \*)string length:(NSUInteger)length error:(NSError \*\*)error;
-    ​- (id)objectWithData:(NSData \*)jsonData;
-    ​- (id)objectWithData:(NSData \*)jsonData error:(NSError \*\*)error;
+    ​- (id)objectWithUTF8String:(const unsigned char *)string length:(NSUInteger)length;
+    ​- (id)objectWithUTF8String:(const unsigned char *)string length:(NSUInteger)length error:(NSError **)error;
+    ​- (id)objectWithData:(NSData *)jsonData;
+    ​- (id)objectWithData:(NSData *)jsonData error:(NSError **)error;
     

     
     These methods are the same as their objectWith… counterparts except they return mutable collection objects.
     
     
-    ​- (id)mutableObjectWithUTF8String:(const unsigned char \*)string length:(NSUInteger)length;
-    ​- (id)mutableObjectWithUTF8String:(const unsigned char \*)string length:(NSUInteger)length error:(NSError \*\*)error;
-    ​- (id)mutableObjectWithData:(NSData \*)jsonData;
-    ​- (id)mutableObjectWithData:(NSData \*)jsonData error:(NSError \*\*)error;
+    ​- (id)mutableObjectWithUTF8String:(const unsigned char *)string length:(NSUInteger)length;
+    ​- (id)mutableObjectWithUTF8String:(const unsigned char *)string length:(NSUInteger)length error:(NSError **)error;
+    ​- (id)mutableObjectWithData:(NSData *)jsonData;
+    ​- (id)mutableObjectWithData:(NSData *)jsonData error:(NSError **)error;
     

 
 *   The following methods were added to `NSString (JSONKitDeserializing)`–
@@ -158,7 +158,7 @@
     
     ​- (id)mutableObjectFromJSONString;
     ​- (id)mutableObjectFromJSONStringWithParseOptions:(JKParseOptionFlags)parseOptionFlags;
-    ​- (id)mutableObjectFromJSONStringWithParseOptions:(JKParseOptionFlags)parseOptionFlags error:(NSError \*\*)error;
+    ​- (id)mutableObjectFromJSONStringWithParseOptions:(JKParseOptionFlags)parseOptionFlags error:(NSError **)error;
     

 
 *   The following methods were added to `NSData (JSONKitDeserializing)`–
@@ -168,7 +168,7 @@
     
     ​- (id)mutableObjectFromJSONData;
     ​- (id)mutableObjectFromJSONDataWithParseOptions:(JKParseOptionFlags)parseOptionFlags;
-    ​- (id)mutableObjectFromJSONDataWithParseOptions:(JKParseOptionFlags)parseOptionFlags error:(NSError \*\*)error;
+    ​- (id)mutableObjectFromJSONDataWithParseOptions:(JKParseOptionFlags)parseOptionFlags error:(NSError **)error;
     

 
 *   The following methods were added to `NSString (JSONKitSerializing)`–
@@ -176,10 +176,10 @@
     These methods are for those uses that need to serialize a single [`NSString`][NSString]–
     
     
-    ​- (NSData \*)JSONData;
-    ​- (NSData \*)JSONDataWithOptions:(JKSerializeOptionFlags)serializeOptions includeQuotes:(BOOL)includeQuotes error:(NSError \*\*)error;
-    ​- (NSString \*)JSONString;
-    ​- (NSString \*)JSONStringWithOptions:(JKSerializeOptionFlags)serializeOptions includeQuotes:(BOOL)includeQuotes error:(NSError \*\*)error;
+    ​- (NSData *)JSONData;
+    ​- (NSData *)JSONDataWithOptions:(JKSerializeOptionFlags)serializeOptions includeQuotes:(BOOL)includeQuotes error:(NSError **)error;
+    ​- (NSString *)JSONString;
+    ​- (NSString *)JSONStringWithOptions:(JKSerializeOptionFlags)serializeOptions includeQuotes:(BOOL)includeQuotes error:(NSError **)error;
     

     
 ### Bug Fixes