Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Rename SBJSON to FBSBJSON in iOS SDK

Summary: Rename SBJSON to FBSBJSON in iOS SDK; also updated references in sample Hackbook project

Test Plan:
After refactoring, verified sdk build with the ./scripts/build_distribution.sh script (though I don't have appledocs installed). Then verified Hackbook project builds and runs in simulator.

Let me know if there are other tests for the sdk.

Reviewers: jacl

Reviewed By: jacl

CC: mmarucheck, security-diffs@lists

Differential Revision: https://phabricator.fb.com/D565036

Task ID: 1431284
  • Loading branch information...
commit 0217eceaf1a30d822e307c704eefadc6ef1fe514 1 parent f777170
@chrisp-fb chrisp-fb authored
View
28 samples/Hackbook/Hackbook.xcodeproj/project.pbxproj
@@ -68,36 +68,22 @@
DD37EA9915ABA8A90015966B /* FacebookSDK.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = FacebookSDK.h; path = ../../build/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FacebookSDK.h; sourceTree = "<group>"; };
DD37EA9A15ABA8A90015966B /* FBCacheDescriptor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = FBCacheDescriptor.h; path = ../../build/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBCacheDescriptor.h; sourceTree = "<group>"; };
DD37EA9B15ABA8A90015966B /* FBConnect.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = FBConnect.h; path = ../../build/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBConnect.h; sourceTree = "<group>"; };
- DD37EA9C15ABA8A90015966B /* FBDataDiskCache.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = FBDataDiskCache.h; path = ../../build/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBDataDiskCache.h; sourceTree = "<group>"; };
DD37EA9D15ABA8A90015966B /* FBDialog.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = FBDialog.h; path = ../../build/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBDialog.h; sourceTree = "<group>"; };
DD37EA9E15ABA8A90015966B /* FBError.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = FBError.h; path = ../../build/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBError.h; sourceTree = "<group>"; };
DD37EA9F15ABA8A90015966B /* FBFrictionlessRequestSettings.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = FBFrictionlessRequestSettings.h; path = ../../build/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBFrictionlessRequestSettings.h; sourceTree = "<group>"; };
DD37EAA015ABA8A90015966B /* FBFriendPickerViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = FBFriendPickerViewController.h; path = ../../build/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBFriendPickerViewController.h; sourceTree = "<group>"; };
DD37EAA115ABA8A90015966B /* FBGraphLocation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = FBGraphLocation.h; path = ../../build/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBGraphLocation.h; sourceTree = "<group>"; };
DD37EAA215ABA8A90015966B /* FBGraphObject.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = FBGraphObject.h; path = ../../build/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBGraphObject.h; sourceTree = "<group>"; };
- DD37EAA315ABA8A90015966B /* FBGraphObjectTableDataSource.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = FBGraphObjectTableDataSource.h; path = ../../build/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBGraphObjectTableDataSource.h; sourceTree = "<group>"; };
- DD37EAA415ABA8A90015966B /* FBGraphObjectTableSelection.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = FBGraphObjectTableSelection.h; path = ../../build/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBGraphObjectTableSelection.h; sourceTree = "<group>"; };
DD37EAA515ABA8A90015966B /* FBGraphPlace.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = FBGraphPlace.h; path = ../../build/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBGraphPlace.h; sourceTree = "<group>"; };
DD37EAA615ABA8A90015966B /* FBGraphUser.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = FBGraphUser.h; path = ../../build/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBGraphUser.h; sourceTree = "<group>"; };
DD37EAA715ABA8A90015966B /* FBLoginDialog.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = FBLoginDialog.h; path = ../../build/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBLoginDialog.h; sourceTree = "<group>"; };
DD37EAA815ABA8A90015966B /* FBOpenGraphAction.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = FBOpenGraphAction.h; path = ../../build/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBOpenGraphAction.h; sourceTree = "<group>"; };
DD37EAA915ABA8A90015966B /* FBProfilePictureView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = FBProfilePictureView.h; path = ../../build/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBProfilePictureView.h; sourceTree = "<group>"; };
DD37EAAA15ABA8A90015966B /* FBRequest.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = FBRequest.h; path = ../../build/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBRequest.h; sourceTree = "<group>"; };
- DD37EAAB15ABA8A90015966B /* FBRequestBody.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = FBRequestBody.h; path = ../../build/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBRequestBody.h; sourceTree = "<group>"; };
DD37EAAC15ABA8A90015966B /* FBRequestConnection.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = FBRequestConnection.h; path = ../../build/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBRequestConnection.h; sourceTree = "<group>"; };
DD37EAAD15ABA8A90015966B /* FBSession.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = FBSession.h; path = ../../build/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBSession.h; sourceTree = "<group>"; };
- DD37EAAE15ABA8A90015966B /* FBSession+Internal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "FBSession+Internal.h"; path = "../../build/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBSession+Internal.h"; sourceTree = "<group>"; };
DD37EAAF15ABA8A90015966B /* FBSessionManualTokenCachingStrategy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = FBSessionManualTokenCachingStrategy.h; path = ../../build/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBSessionManualTokenCachingStrategy.h; sourceTree = "<group>"; };
DD37EAB015ABA8A90015966B /* FBSessionTokenCachingStrategy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = FBSessionTokenCachingStrategy.h; path = ../../build/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBSessionTokenCachingStrategy.h; sourceTree = "<group>"; };
- DD37EAB115ABA8A90015966B /* FBURLConnection.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = FBURLConnection.h; path = ../../build/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBURLConnection.h; sourceTree = "<group>"; };
- DD37EAB215ABA8A90015966B /* FBUtility.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = FBUtility.h; path = ../../build/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBUtility.h; sourceTree = "<group>"; };
- DD37EAB315ABA8A90015966B /* JSON.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = JSON.h; path = ../../build/FacebookSDK.framework/Versions/A/DeprecatedHeaders/JSON.h; sourceTree = "<group>"; };
- DD37EAB415ABA8A90015966B /* NSObject+SBJSON.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "NSObject+SBJSON.h"; path = "../../build/FacebookSDK.framework/Versions/A/DeprecatedHeaders/NSObject+SBJSON.h"; sourceTree = "<group>"; };
- DD37EAB515ABA8A90015966B /* NSString+SBJSON.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "NSString+SBJSON.h"; path = "../../build/FacebookSDK.framework/Versions/A/DeprecatedHeaders/NSString+SBJSON.h"; sourceTree = "<group>"; };
- DD37EAB615ABA8A90015966B /* SBJSON.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SBJSON.h; path = ../../build/FacebookSDK.framework/Versions/A/DeprecatedHeaders/SBJSON.h; sourceTree = "<group>"; };
- DD37EAB715ABA8A90015966B /* SBJsonBase.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SBJsonBase.h; path = ../../build/FacebookSDK.framework/Versions/A/DeprecatedHeaders/SBJsonBase.h; sourceTree = "<group>"; };
- DD37EAB815ABA8A90015966B /* SBJsonParser.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SBJsonParser.h; path = ../../build/FacebookSDK.framework/Versions/A/DeprecatedHeaders/SBJsonParser.h; sourceTree = "<group>"; };
- DD37EAB915ABA8A90015966B /* SBJsonWriter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SBJsonWriter.h; path = ../../build/FacebookSDK.framework/Versions/A/DeprecatedHeaders/SBJsonWriter.h; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -200,36 +186,22 @@
DD37EA9915ABA8A90015966B /* FacebookSDK.h */,
DD37EA9A15ABA8A90015966B /* FBCacheDescriptor.h */,
DD37EA9B15ABA8A90015966B /* FBConnect.h */,
- DD37EA9C15ABA8A90015966B /* FBDataDiskCache.h */,
DD37EA9D15ABA8A90015966B /* FBDialog.h */,
DD37EA9E15ABA8A90015966B /* FBError.h */,
DD37EA9F15ABA8A90015966B /* FBFrictionlessRequestSettings.h */,
DD37EAA015ABA8A90015966B /* FBFriendPickerViewController.h */,
DD37EAA115ABA8A90015966B /* FBGraphLocation.h */,
DD37EAA215ABA8A90015966B /* FBGraphObject.h */,
- DD37EAA315ABA8A90015966B /* FBGraphObjectTableDataSource.h */,
- DD37EAA415ABA8A90015966B /* FBGraphObjectTableSelection.h */,
DD37EAA515ABA8A90015966B /* FBGraphPlace.h */,
DD37EAA615ABA8A90015966B /* FBGraphUser.h */,
DD37EAA715ABA8A90015966B /* FBLoginDialog.h */,
DD37EAA815ABA8A90015966B /* FBOpenGraphAction.h */,
DD37EAA915ABA8A90015966B /* FBProfilePictureView.h */,
DD37EAAA15ABA8A90015966B /* FBRequest.h */,
- DD37EAAB15ABA8A90015966B /* FBRequestBody.h */,
DD37EAAC15ABA8A90015966B /* FBRequestConnection.h */,
DD37EAAD15ABA8A90015966B /* FBSession.h */,
- DD37EAAE15ABA8A90015966B /* FBSession+Internal.h */,
DD37EAAF15ABA8A90015966B /* FBSessionManualTokenCachingStrategy.h */,
DD37EAB015ABA8A90015966B /* FBSessionTokenCachingStrategy.h */,
- DD37EAB115ABA8A90015966B /* FBURLConnection.h */,
- DD37EAB215ABA8A90015966B /* FBUtility.h */,
- DD37EAB315ABA8A90015966B /* JSON.h */,
- DD37EAB415ABA8A90015966B /* NSObject+SBJSON.h */,
- DD37EAB515ABA8A90015966B /* NSString+SBJSON.h */,
- DD37EAB615ABA8A90015966B /* SBJSON.h */,
- DD37EAB715ABA8A90015966B /* SBJsonBase.h */,
- DD37EAB815ABA8A90015966B /* SBJsonParser.h */,
- DD37EAB915ABA8A90015966B /* SBJsonWriter.h */,
DD35C4BD15B9307600C0849B /* FBConnect.bundle */,
);
name = FBConnect;
View
6 samples/Hackbook/Hackbook/APICallsViewController.m
@@ -355,7 +355,7 @@ - (void)apiPromptExtendedPermissions {
*/
- (void)apiDialogFeedUser {
currentAPICall = kDialogFeedUser;
- SBJSON *jsonWriter = [[SBJSON new] autorelease];
+ FBSBJSON *jsonWriter = [[FBSBJSON new] autorelease];
// The action links to be shown with the post in the feed
NSArray* actionLinks = [NSArray arrayWithObjects:[NSDictionary dictionaryWithObjectsAndKeys:
@@ -393,7 +393,7 @@ - (void)getFriendsCallAPIDialogFeed {
*/
- (void)apiDialogFeedFriend:(NSString *)friendID {
currentAPICall = kDialogFeedFriend;
- SBJSON *jsonWriter = [[SBJSON new] autorelease];
+ FBSBJSON *jsonWriter = [[FBSBJSON new] autorelease];
NSArray* actionLinks = [NSArray arrayWithObjects:[NSDictionary dictionaryWithObjectsAndKeys:
@"Get Started",@"name",@"http://m.facebook.com/apps/hackbookios/",@"link", nil], nil];
@@ -427,7 +427,7 @@ - (void)apiDialogFeedFriend:(NSString *)friendID {
*/
- (void)apiDialogRequestsSendToMany {
currentAPICall = kDialogRequestsSendToMany;
- SBJSON *jsonWriter = [[SBJSON new] autorelease];
+ FBSBJSON *jsonWriter = [[FBSBJSON new] autorelease];
NSDictionary *gift = [NSDictionary dictionaryWithObjectsAndKeys:
@"5", @"social_karma",
@"1", @"badge_of_awesomeness",
View
2  samples/Hackbook/Hackbook/APIResultsViewController.m
@@ -123,7 +123,7 @@ - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interface
*/
- (void)apiGraphUserCheckins:(NSUInteger)index {
HackbookAppDelegate *delegate = (HackbookAppDelegate *)[[UIApplication sharedApplication] delegate];
- SBJSON *jsonWriter = [[SBJSON new] autorelease];
+ FBSBJSON *jsonWriter = [[FBSBJSON new] autorelease];
NSDictionary *coordinates = [NSDictionary dictionaryWithObjectsAndKeys:
[[[myData objectAtIndex:index] objectForKey:@"location"] objectForKey:@"latitude"],@"latitude",
View
2  src/FBConnect.h
@@ -19,4 +19,4 @@
#include "FBDialog.h"
#include "FBLoginDialog.h"
#include "FBRequest.h"
-#include "SBJSON.h"
+#include "FBSBJSON.h"
View
4 src/FBDialog.m
@@ -16,9 +16,9 @@
#import "FBDialog.h"
+#import "FBSBJSON.h"
#import "Facebook.h"
#import "FBFrictionlessRequestSettings.h"
-#import "JSON.h"
#import "FBUtility.h"
///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -297,7 +297,7 @@ - (void)dialogSuccessHandleFrictionlessResponses:(NSURL *)url {
needle:@"frictionless_recipients="];
if (recipientJson) {
// if value parses as an array, treat as set of fbids
- SBJsonParser *parser = [[[SBJsonParser alloc]
+ FBSBJsonParser *parser = [[[FBSBJsonParser alloc]
init]
autorelease];
id recipients = [parser objectWithString:recipientJson];
View
1  src/FBRequest.m
@@ -15,7 +15,6 @@
*/
#import "Facebook.h"
-#import "JSON.h"
#import "FBUtility.h"
#import "FBSession+Internal.h"
View
6 src/FBRequestConnection.m
@@ -15,7 +15,7 @@
*/
#import <UIKit/UIImage.h>
-#import "JSON.h"
+#import "FBSBJSON.h"
#import "FBError.h"
#import "FBURLConnection.h"
#import "FBRequestBody.h"
@@ -724,7 +724,7 @@ - (void)appendJSONRequests:(NSArray *)requests
attachments:attachments];
}
- SBJSON *writer = [[SBJSON alloc] init];
+ FBSBJSON *writer = [[FBSBJSON alloc] init];
NSString *jsonBatch = [writer stringWithObject:batch];
[writer release];
[batch release];
@@ -1068,7 +1068,7 @@ - (id)parseJSONOrOtherwise:(NSString *)utf8
{
id parsed = nil;
if (!(*error)) {
- SBJSON *parser = [[SBJSON alloc] init];
+ FBSBJSON *parser = [[FBSBJSON alloc] init];
parsed = [parser objectWithString:utf8 error:error];
// if we fail parse we attemp a reparse of a modified input to support results in the form "foo=bar", "true", etc.
if (*error) {
View
4 src/FBTestSession.m
@@ -23,7 +23,7 @@
#import "FBSession+Internal.h"
#import "FBRequest.h"
#import <pthread.h>
-#import "JSON.h"
+#import "FBSBJSON.h"
#import "FBGraphUser.h"
/*
@@ -295,7 +295,7 @@ - (void)retrieveTestUsersForApp
userQuery, @"users",
nil];
- SBJSON *writer = [[SBJSON alloc] init];
+ FBSBJSON *writer = [[FBSBJSON alloc] init];
NSString *jsonMultiquery = [writer stringWithObject:multiquery];
[writer release];
View
4 src/Facebook.m
@@ -20,7 +20,7 @@
#import "FBRequest.h"
#import "FBError.h"
#import "FBSessionManualTokenCachingStrategy.h"
-#import "JSON.h"
+#import "FBSBJSON.h"
#import "FBSession+Internal.h"
#import "FBUtility.h"
@@ -695,7 +695,7 @@ - (void)dialog:(NSString *)action
id fbid = [params objectForKey:@"to"];
if (fbid != nil) {
// if value parses as a json array expression get the list that way
- SBJsonParser *parser = [[[SBJsonParser alloc] init] autorelease];
+ FBSBJsonParser *parser = [[[FBSBJsonParser alloc] init] autorelease];
id fbids = [parser objectWithString:fbid];
if (![fbids isKindOfClass:[NSArray class]]) {
// otherwise seperate by commas (handles the singleton case too)
View
10 src/JSON/SBJSON.h → src/JSON/FBSBJSON.h
@@ -28,19 +28,19 @@
*/
#import <Foundation/Foundation.h>
-#import "SBJsonParser.h"
-#import "SBJsonWriter.h"
+#import "FBSBJsonParser.h"
+#import "FBSBJsonWriter.h"
/**
@brief Facade for SBJsonWriter/SBJsonParser.
Requests are forwarded to instances of SBJsonWriter and SBJsonParser.
*/
-@interface SBJSON : SBJsonBase <SBJsonParser, SBJsonWriter> {
+@interface FBSBJSON : FBSBJsonBase <FBSBJsonParser, FBSBJsonWriter> {
@private
- SBJsonParser *jsonParser;
- SBJsonWriter *jsonWriter;
+ FBSBJsonParser *jsonParser;
+ FBSBJsonWriter *jsonWriter;
}
View
8 src/JSON/SBJSON.m → src/JSON/FBSBJSON.m
@@ -27,15 +27,15 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import "SBJSON.h"
+#import "FBSBJSON.h"
-@implementation SBJSON
+@implementation FBSBJSON
- (id)init {
self = [super init];
if (self) {
- jsonWriter = [SBJsonWriter new];
- jsonParser = [SBJsonParser new];
+ jsonWriter = [FBSBJsonWriter new];
+ jsonParser = [FBSBJsonParser new];
[self setMaxDepth:512];
}
View
2  src/JSON/SBJsonBase.h → src/JSON/FBSBJsonBase.h
@@ -52,7 +52,7 @@ enum {
This class contains the common error-handling code and option between the parser/writer.
*/
-@interface SBJsonBase : NSObject {
+@interface FBSBJsonBase : NSObject {
NSMutableArray *errorTrace;
@protected
View
4 src/JSON/SBJsonBase.m → src/JSON/FBSBJsonBase.m
@@ -27,11 +27,11 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import "SBJsonBase.h"
+#import "FBSBJsonBase.h"
NSString * SBJSONErrorDomain = @"org.brautaset.JSON.ErrorDomain";
-@implementation SBJsonBase
+@implementation FBSBJsonBase
@synthesize errorTrace;
@synthesize maxDepth;
View
8 src/JSON/SBJsonParser.h → src/JSON/FBSBJsonParser.h
@@ -28,14 +28,14 @@
*/
#import <Foundation/Foundation.h>
-#import "SBJsonBase.h"
+#import "FBSBJsonBase.h"
/**
@brief Options for the parser class.
This exists so the SBJSON facade can implement the options in the parser without having to re-declare them.
*/
-@protocol SBJsonParser
+@protocol FBSBJsonParser
/**
@brief Return the object represented by the given string.
@@ -71,7 +71,7 @@
as we can thus avoid any loss of precision. (JSON allows ridiculously large numbers.)
*/
-@interface SBJsonParser : SBJsonBase <SBJsonParser> {
+@interface FBSBJsonParser : FBSBJsonBase <FBSBJsonParser> {
@private
const char *c;
@@ -80,7 +80,7 @@
@end
// don't use - exists for backwards compatibility with 2.1.x only. Will be removed in 2.3.
-@interface SBJsonParser (Private)
+@interface FBSBJsonParser (Private)
- (id)fragmentWithString:(id)repr;
@end
View
6 src/JSON/SBJsonParser.m → src/JSON/FBSBJsonParser.m
@@ -27,9 +27,9 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import "SBJsonParser.h"
+#import "FBSBJsonParser.h"
-@interface SBJsonParser ()
+@interface FBSBJsonParser ()
- (BOOL)scanValue:(NSObject **)o;
@@ -54,7 +54,7 @@ - (BOOL)scanIsAtEnd;
#define skipDigits(c) while (isdigit(*c)) c++
-@implementation SBJsonParser
+@implementation FBSBJsonParser
static char ctrl[0x22];
View
8 src/JSON/SBJsonWriter.h → src/JSON/FBSBJsonWriter.h
@@ -28,14 +28,14 @@
*/
#import <Foundation/Foundation.h>
-#import "SBJsonBase.h"
+#import "FBSBJsonBase.h"
/**
@brief Options for the writer class.
This exists so the SBJSON facade can implement the options in the writer without having to re-declare them.
*/
-@protocol SBJsonWriter
+@protocol FBSBJsonWriter
/**
@brief Whether we are generating human-readable (multiline) JSON.
@@ -91,7 +91,7 @@
way you would expect.
*/
-@interface SBJsonWriter : SBJsonBase <SBJsonWriter> {
+@interface FBSBJsonWriter : FBSBJsonBase <FBSBJsonWriter> {
@private
BOOL sortKeys, humanReadable;
@@ -100,7 +100,7 @@
@end
// don't use - exists for backwards compatibility. Will be removed in 2.3.
-@interface SBJsonWriter (Private)
+@interface FBSBJsonWriter (Private)
- (NSString*)stringWithFragment:(id)value;
@end
View
6 src/JSON/SBJsonWriter.m → src/JSON/FBSBJsonWriter.m
@@ -27,9 +27,9 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import "SBJsonWriter.h"
+#import "FBSBJsonWriter.h"
-@interface SBJsonWriter ()
+@interface FBSBJsonWriter ()
- (BOOL)appendValue:(id)fragment into:(NSMutableString*)json;
- (BOOL)appendArray:(NSArray*)fragment into:(NSMutableString*)json;
@@ -40,7 +40,7 @@ - (NSString*)indent;
@end
-@implementation SBJsonWriter
+@implementation FBSBJsonWriter
static NSMutableCharacterSet *kEscapeChars;
View
50 src/JSON/JSON.h
@@ -1,50 +0,0 @@
-/*
- Copyright (C) 2009 Stig Brautaset. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- * Neither the name of the author nor the names of its contributors may be used
- to endorse or promote products derived from this software without specific
- prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/**
- @mainpage A strict JSON parser and generator for Objective-C
-
- JSON (JavaScript Object Notation) is a lightweight data-interchange
- format. This framework provides two apis for parsing and generating
- JSON. One standard object-based and a higher level api consisting of
- categories added to existing Objective-C classes.
-
- Learn more on the http://code.google.com/p/json-framework project site.
-
- This framework does its best to be as strict as possible, both in what it
- accepts and what it generates. For example, it does not support trailing commas
- in arrays or objects. Nor does it support embedded comments, or
- anything else not in the JSON specification. This is considered a feature.
-
-*/
-
-#import "SBJSON.h"
-#import "NSObject+SBJSON.h"
-#import "NSString+SBJSON.h"
-
View
68 src/JSON/NSObject+SBJSON.h
@@ -1,68 +0,0 @@
-/*
- Copyright (C) 2009 Stig Brautaset. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- * Neither the name of the author nor the names of its contributors may be used
- to endorse or promote products derived from this software without specific
- prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import <Foundation/Foundation.h>
-
-
-/**
- @brief Adds JSON generation to Foundation classes
-
- This is a category on NSObject that adds methods for returning JSON representations
- of standard objects to the objects themselves. This means you can call the
- -JSONRepresentation method on an NSArray object and it'll do what you want.
- */
-@interface NSObject (NSObject_SBJSON)
-
-/**
- @brief Returns a string containing the receiver encoded as a JSON fragment.
-
- This method is added as a category on NSObject but is only actually
- supported for the following objects:
- @li NSDictionary
- @li NSArray
- @li NSString
- @li NSNumber (also used for booleans)
- @li NSNull
-
- @deprecated Given we bill ourselves as a "strict" JSON library, this method should be removed.
- */
-- (NSString *)JSONFragment;
-
-/**
- @brief Returns a string containing the receiver encoded in JSON.
-
- This method is added as a category on NSObject but is only actually
- supported for the following objects:
- @li NSDictionary
- @li NSArray
- */
-- (NSString *)JSONRepresentation;
-
-@end
-
View
53 src/JSON/NSObject+SBJSON.m
@@ -1,53 +0,0 @@
-/*
- Copyright (C) 2009 Stig Brautaset. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- * Neither the name of the author nor the names of its contributors may be used
- to endorse or promote products derived from this software without specific
- prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "NSObject+SBJSON.h"
-#import "SBJsonWriter.h"
-
-@implementation NSObject (NSObject_SBJSON)
-
-- (NSString *)JSONFragment {
- SBJsonWriter *jsonWriter = [SBJsonWriter new];
- NSString *json = [jsonWriter stringWithFragment:self];
- if (!json)
- NSLog(@"-JSONFragment failed. Error trace is: %@", [jsonWriter errorTrace]);
- [jsonWriter release];
- return json;
-}
-
-- (NSString *)JSONRepresentation {
- SBJsonWriter *jsonWriter = [SBJsonWriter new];
- NSString *json = [jsonWriter stringWithObject:self];
- if (!json)
- NSLog(@"-JSONRepresentation failed. Error trace is: %@", [jsonWriter errorTrace]);
- [jsonWriter release];
- return json;
-}
-
-@end
View
58 src/JSON/NSString+SBJSON.h
@@ -1,58 +0,0 @@
-/*
- Copyright (C) 2009 Stig Brautaset. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- * Neither the name of the author nor the names of its contributors may be used
- to endorse or promote products derived from this software without specific
- prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import <Foundation/Foundation.h>
-
-/**
- @brief Adds JSON parsing methods to NSString
-
-This is a category on NSString that adds methods for parsing the target string.
-*/
-@interface NSString (NSString_SBJSON)
-
-
-/**
- @brief Returns the object represented in the receiver, or nil on error.
-
- Returns a a scalar object represented by the string's JSON fragment representation.
-
- @deprecated Given we bill ourselves as a "strict" JSON library, this method should be removed.
- */
-- (id)JSONFragmentValue;
-
-/**
- @brief Returns the NSDictionary or NSArray represented by the current string's JSON representation.
-
- Returns the dictionary or array represented in the receiver, or nil on error.
-
- Returns the NSDictionary or NSArray represented by the current string's JSON representation.
- */
-- (id)JSONValue;
-
-@end
View
55 src/JSON/NSString+SBJSON.m
@@ -1,55 +0,0 @@
-/*
- Copyright (C) 2007-2009 Stig Brautaset. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- * Neither the name of the author nor the names of its contributors may be used
- to endorse or promote products derived from this software without specific
- prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "NSString+SBJSON.h"
-#import "SBJsonParser.h"
-
-@implementation NSString (NSString_SBJSON)
-
-- (id)JSONFragmentValue
-{
- SBJsonParser *jsonParser = [SBJsonParser new];
- id repr = [jsonParser fragmentWithString:self];
- if (!repr)
- NSLog(@"-JSONFragmentValue failed. Error trace is: %@", [jsonParser errorTrace]);
- [jsonParser release];
- return repr;
-}
-
-- (id)JSONValue
-{
- SBJsonParser *jsonParser = [SBJsonParser new];
- id repr = [jsonParser objectWithString:self];
- if (!repr)
- NSLog(@"-JSONValue failed. Error trace is: %@", [jsonParser errorTrace]);
- [jsonParser release];
- return repr;
-}
-
-@end
View
104 src/facebook-ios-sdk.xcodeproj/project.pbxproj
@@ -74,12 +74,10 @@
84FA426E153E15A3009CEEF8 /* FBRequestBody.m in Sources */ = {isa = PBXBuildFile; fileRef = E29B4E63152631FB00D1BE21 /* FBRequestBody.m */; };
84FA426F153E15A3009CEEF8 /* FBURLConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = E23E5A0E1521163C00A011A8 /* FBURLConnection.m */; };
84FA4270153E15D1009CEEF8 /* FBError.m in Sources */ = {isa = PBXBuildFile; fileRef = E23E5A0A1521161900A011A8 /* FBError.m */; };
- 84FA4271153E15EE009CEEF8 /* NSObject+SBJSON.m in Sources */ = {isa = PBXBuildFile; fileRef = AEA93B1611D52959000A4545 /* NSObject+SBJSON.m */; };
- 84FA4272153E15EE009CEEF8 /* NSString+SBJSON.m in Sources */ = {isa = PBXBuildFile; fileRef = AEA93B1811D52959000A4545 /* NSString+SBJSON.m */; };
- 84FA4273153E15EE009CEEF8 /* SBJSON.m in Sources */ = {isa = PBXBuildFile; fileRef = AEA93B1A11D52959000A4545 /* SBJSON.m */; };
- 84FA4274153E15EE009CEEF8 /* SBJsonBase.m in Sources */ = {isa = PBXBuildFile; fileRef = AEA93B1C11D52959000A4545 /* SBJsonBase.m */; };
- 84FA4275153E15EE009CEEF8 /* SBJsonParser.m in Sources */ = {isa = PBXBuildFile; fileRef = AEA93B1E11D52959000A4545 /* SBJsonParser.m */; };
- 84FA4276153E15EE009CEEF8 /* SBJsonWriter.m in Sources */ = {isa = PBXBuildFile; fileRef = AEA93B2011D52959000A4545 /* SBJsonWriter.m */; };
+ 84FA4273153E15EE009CEEF8 /* FBSBJSON.m in Sources */ = {isa = PBXBuildFile; fileRef = AEA93B1A11D52959000A4545 /* FBSBJSON.m */; };
+ 84FA4274153E15EE009CEEF8 /* FBSBJsonBase.m in Sources */ = {isa = PBXBuildFile; fileRef = AEA93B1C11D52959000A4545 /* FBSBJsonBase.m */; };
+ 84FA4275153E15EE009CEEF8 /* FBSBJsonParser.m in Sources */ = {isa = PBXBuildFile; fileRef = AEA93B1E11D52959000A4545 /* FBSBJsonParser.m */; };
+ 84FA4276153E15EE009CEEF8 /* FBSBJsonWriter.m in Sources */ = {isa = PBXBuildFile; fileRef = AEA93B2011D52959000A4545 /* FBSBJsonWriter.m */; };
84FA4277153E1609009CEEF8 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B96F15E2152B927E00A52896 /* CoreLocation.framework */; };
84FA427A153E1968009CEEF8 /* FBTestBlocker.m in Sources */ = {isa = PBXBuildFile; fileRef = 84FA4279153E1968009CEEF8 /* FBTestBlocker.m */; };
85052AF9156F5E1200F8F9A5 /* FBTestSessionTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 85052AF8156F5E1200F8F9A5 /* FBTestSessionTests.m */; };
@@ -109,19 +107,14 @@
AEA93B0C11D5293B000A4545 /* FBRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = AEA93B0311D5293B000A4545 /* FBRequest.m */; };
AEA93B1011D5293B000A4545 /* FBLoginDialog.m in Sources */ = {isa = PBXBuildFile; fileRef = AEA93B0711D5293B000A4545 /* FBLoginDialog.m */; };
AEA93B1211D5293B000A4545 /* FBDialog.m in Sources */ = {isa = PBXBuildFile; fileRef = AEA93B0911D5293B000A4545 /* FBDialog.m */; };
- AEA93B2111D52959000A4545 /* JSON.h in Headers */ = {isa = PBXBuildFile; fileRef = AEA93B1411D52959000A4545 /* JSON.h */; settings = {ATTRIBUTES = (); }; };
- AEA93B2211D52959000A4545 /* NSObject+SBJSON.h in Headers */ = {isa = PBXBuildFile; fileRef = AEA93B1511D52959000A4545 /* NSObject+SBJSON.h */; settings = {ATTRIBUTES = (); }; };
- AEA93B2311D52959000A4545 /* NSObject+SBJSON.m in Sources */ = {isa = PBXBuildFile; fileRef = AEA93B1611D52959000A4545 /* NSObject+SBJSON.m */; };
- AEA93B2411D52959000A4545 /* NSString+SBJSON.h in Headers */ = {isa = PBXBuildFile; fileRef = AEA93B1711D52959000A4545 /* NSString+SBJSON.h */; settings = {ATTRIBUTES = (); }; };
- AEA93B2511D52959000A4545 /* NSString+SBJSON.m in Sources */ = {isa = PBXBuildFile; fileRef = AEA93B1811D52959000A4545 /* NSString+SBJSON.m */; };
- AEA93B2611D52959000A4545 /* SBJSON.h in Headers */ = {isa = PBXBuildFile; fileRef = AEA93B1911D52959000A4545 /* SBJSON.h */; settings = {ATTRIBUTES = (); }; };
- AEA93B2711D52959000A4545 /* SBJSON.m in Sources */ = {isa = PBXBuildFile; fileRef = AEA93B1A11D52959000A4545 /* SBJSON.m */; };
- AEA93B2811D52959000A4545 /* SBJsonBase.h in Headers */ = {isa = PBXBuildFile; fileRef = AEA93B1B11D52959000A4545 /* SBJsonBase.h */; settings = {ATTRIBUTES = (); }; };
- AEA93B2911D52959000A4545 /* SBJsonBase.m in Sources */ = {isa = PBXBuildFile; fileRef = AEA93B1C11D52959000A4545 /* SBJsonBase.m */; };
- AEA93B2A11D52959000A4545 /* SBJsonParser.h in Headers */ = {isa = PBXBuildFile; fileRef = AEA93B1D11D52959000A4545 /* SBJsonParser.h */; settings = {ATTRIBUTES = (); }; };
- AEA93B2B11D52959000A4545 /* SBJsonParser.m in Sources */ = {isa = PBXBuildFile; fileRef = AEA93B1E11D52959000A4545 /* SBJsonParser.m */; };
- AEA93B2C11D52959000A4545 /* SBJsonWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = AEA93B1F11D52959000A4545 /* SBJsonWriter.h */; settings = {ATTRIBUTES = (); }; };
- AEA93B2D11D52959000A4545 /* SBJsonWriter.m in Sources */ = {isa = PBXBuildFile; fileRef = AEA93B2011D52959000A4545 /* SBJsonWriter.m */; };
+ AEA93B2611D52959000A4545 /* FBSBJSON.h in Headers */ = {isa = PBXBuildFile; fileRef = AEA93B1911D52959000A4545 /* FBSBJSON.h */; settings = {ATTRIBUTES = (); }; };
+ AEA93B2711D52959000A4545 /* FBSBJSON.m in Sources */ = {isa = PBXBuildFile; fileRef = AEA93B1A11D52959000A4545 /* FBSBJSON.m */; };
+ AEA93B2811D52959000A4545 /* FBSBJsonBase.h in Headers */ = {isa = PBXBuildFile; fileRef = AEA93B1B11D52959000A4545 /* FBSBJsonBase.h */; settings = {ATTRIBUTES = (); }; };
+ AEA93B2911D52959000A4545 /* FBSBJsonBase.m in Sources */ = {isa = PBXBuildFile; fileRef = AEA93B1C11D52959000A4545 /* FBSBJsonBase.m */; };
+ AEA93B2A11D52959000A4545 /* FBSBJsonParser.h in Headers */ = {isa = PBXBuildFile; fileRef = AEA93B1D11D52959000A4545 /* FBSBJsonParser.h */; settings = {ATTRIBUTES = (); }; };
+ AEA93B2B11D52959000A4545 /* FBSBJsonParser.m in Sources */ = {isa = PBXBuildFile; fileRef = AEA93B1E11D52959000A4545 /* FBSBJsonParser.m */; };
+ AEA93B2C11D52959000A4545 /* FBSBJsonWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = AEA93B1F11D52959000A4545 /* FBSBJsonWriter.h */; settings = {ATTRIBUTES = (); }; };
+ AEA93B2D11D52959000A4545 /* FBSBJsonWriter.m in Sources */ = {isa = PBXBuildFile; fileRef = AEA93B2011D52959000A4545 /* FBSBJsonWriter.m */; };
B966ADFC152D020E005FC07B /* FBGraphObjectTableCell.h in Headers */ = {isa = PBXBuildFile; fileRef = B966ADFA152D020E005FC07B /* FBGraphObjectTableCell.h */; };
B966ADFD152D020E005FC07B /* FBGraphObjectTableCell.m in Sources */ = {isa = PBXBuildFile; fileRef = B966ADFB152D020E005FC07B /* FBGraphObjectTableCell.m */; };
B96F15E3152B927E00A52896 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B96F15E2152B927E00A52896 /* CoreLocation.framework */; };
@@ -250,19 +243,14 @@
AEA93B0711D5293B000A4545 /* FBLoginDialog.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FBLoginDialog.m; sourceTree = "<group>"; };
AEA93B0811D5293B000A4545 /* FBDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FBDialog.h; sourceTree = "<group>"; };
AEA93B0911D5293B000A4545 /* FBDialog.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FBDialog.m; sourceTree = "<group>"; };
- AEA93B1411D52959000A4545 /* JSON.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSON.h; sourceTree = "<group>"; };
- AEA93B1511D52959000A4545 /* NSObject+SBJSON.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSObject+SBJSON.h"; sourceTree = "<group>"; };
- AEA93B1611D52959000A4545 /* NSObject+SBJSON.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSObject+SBJSON.m"; sourceTree = "<group>"; };
- AEA93B1711D52959000A4545 /* NSString+SBJSON.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+SBJSON.h"; sourceTree = "<group>"; };
- AEA93B1811D52959000A4545 /* NSString+SBJSON.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+SBJSON.m"; sourceTree = "<group>"; };
- AEA93B1911D52959000A4545 /* SBJSON.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SBJSON.h; sourceTree = "<group>"; };
- AEA93B1A11D52959000A4545 /* SBJSON.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SBJSON.m; sourceTree = "<group>"; };
- AEA93B1B11D52959000A4545 /* SBJsonBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SBJsonBase.h; sourceTree = "<group>"; };
- AEA93B1C11D52959000A4545 /* SBJsonBase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SBJsonBase.m; sourceTree = "<group>"; };
- AEA93B1D11D52959000A4545 /* SBJsonParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SBJsonParser.h; sourceTree = "<group>"; };
- AEA93B1E11D52959000A4545 /* SBJsonParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SBJsonParser.m; sourceTree = "<group>"; };
- AEA93B1F11D52959000A4545 /* SBJsonWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SBJsonWriter.h; sourceTree = "<group>"; };
- AEA93B2011D52959000A4545 /* SBJsonWriter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SBJsonWriter.m; sourceTree = "<group>"; };
+ AEA93B1911D52959000A4545 /* FBSBJSON.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FBSBJSON.h; sourceTree = "<group>"; };
+ AEA93B1A11D52959000A4545 /* FBSBJSON.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FBSBJSON.m; sourceTree = "<group>"; };
+ AEA93B1B11D52959000A4545 /* FBSBJsonBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FBSBJsonBase.h; sourceTree = "<group>"; };
+ AEA93B1C11D52959000A4545 /* FBSBJsonBase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FBSBJsonBase.m; sourceTree = "<group>"; };
+ AEA93B1D11D52959000A4545 /* FBSBJsonParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FBSBJsonParser.h; sourceTree = "<group>"; };
+ AEA93B1E11D52959000A4545 /* FBSBJsonParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FBSBJsonParser.m; sourceTree = "<group>"; };
+ AEA93B1F11D52959000A4545 /* FBSBJsonWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FBSBJsonWriter.h; sourceTree = "<group>"; };
+ AEA93B2011D52959000A4545 /* FBSBJsonWriter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FBSBJsonWriter.m; sourceTree = "<group>"; };
B966ADFA152D020E005FC07B /* FBGraphObjectTableCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FBGraphObjectTableCell.h; sourceTree = "<group>"; };
B966ADFB152D020E005FC07B /* FBGraphObjectTableCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FBGraphObjectTableCell.m; sourceTree = "<group>"; };
B96F15E2152B927E00A52896 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
@@ -474,19 +462,14 @@
AEA93B1311D52959000A4545 /* JSON */ = {
isa = PBXGroup;
children = (
- AEA93B1411D52959000A4545 /* JSON.h */,
- AEA93B1511D52959000A4545 /* NSObject+SBJSON.h */,
- AEA93B1611D52959000A4545 /* NSObject+SBJSON.m */,
- AEA93B1711D52959000A4545 /* NSString+SBJSON.h */,
- AEA93B1811D52959000A4545 /* NSString+SBJSON.m */,
- AEA93B1911D52959000A4545 /* SBJSON.h */,
- AEA93B1A11D52959000A4545 /* SBJSON.m */,
- AEA93B1B11D52959000A4545 /* SBJsonBase.h */,
- AEA93B1C11D52959000A4545 /* SBJsonBase.m */,
- AEA93B1D11D52959000A4545 /* SBJsonParser.h */,
- AEA93B1E11D52959000A4545 /* SBJsonParser.m */,
- AEA93B1F11D52959000A4545 /* SBJsonWriter.h */,
- AEA93B2011D52959000A4545 /* SBJsonWriter.m */,
+ AEA93B1911D52959000A4545 /* FBSBJSON.h */,
+ AEA93B1A11D52959000A4545 /* FBSBJSON.m */,
+ AEA93B1B11D52959000A4545 /* FBSBJsonBase.h */,
+ AEA93B1C11D52959000A4545 /* FBSBJsonBase.m */,
+ AEA93B1D11D52959000A4545 /* FBSBJsonParser.h */,
+ AEA93B1E11D52959000A4545 /* FBSBJsonParser.m */,
+ AEA93B1F11D52959000A4545 /* FBSBJsonWriter.h */,
+ AEA93B2011D52959000A4545 /* FBSBJsonWriter.m */,
);
path = JSON;
sourceTree = "<group>";
@@ -545,13 +528,10 @@
849CB18C1523416B00112220 /* FBLoginDialog.h in Headers */,
849CB18D1523416B00112220 /* FBDialog.h in Headers */,
AA747D9F0F9514B9006C5449 /* facebook_ios_sdk_Prefix.pch in Headers */,
- AEA93B2111D52959000A4545 /* JSON.h in Headers */,
- AEA93B2211D52959000A4545 /* NSObject+SBJSON.h in Headers */,
- AEA93B2411D52959000A4545 /* NSString+SBJSON.h in Headers */,
- AEA93B2611D52959000A4545 /* SBJSON.h in Headers */,
- AEA93B2811D52959000A4545 /* SBJsonBase.h in Headers */,
- AEA93B2A11D52959000A4545 /* SBJsonParser.h in Headers */,
- AEA93B2C11D52959000A4545 /* SBJsonWriter.h in Headers */,
+ AEA93B2611D52959000A4545 /* FBSBJSON.h in Headers */,
+ AEA93B2811D52959000A4545 /* FBSBJsonBase.h in Headers */,
+ AEA93B2A11D52959000A4545 /* FBSBJsonParser.h in Headers */,
+ AEA93B2C11D52959000A4545 /* FBSBJsonWriter.h in Headers */,
E29B4E65152631FB00D1BE21 /* FBRequestBody.h in Headers */,
84F43FFE15194E4800CEECD5 /* FBRequestConnection.h in Headers */,
E23E5A0F1521163C00A011A8 /* FBURLConnection.h in Headers */,
@@ -726,12 +706,10 @@
84FA426E153E15A3009CEEF8 /* FBRequestBody.m in Sources */,
84FA426F153E15A3009CEEF8 /* FBURLConnection.m in Sources */,
84FA4270153E15D1009CEEF8 /* FBError.m in Sources */,
- 84FA4271153E15EE009CEEF8 /* NSObject+SBJSON.m in Sources */,
- 84FA4272153E15EE009CEEF8 /* NSString+SBJSON.m in Sources */,
- 84FA4273153E15EE009CEEF8 /* SBJSON.m in Sources */,
- 84FA4274153E15EE009CEEF8 /* SBJsonBase.m in Sources */,
- 84FA4275153E15EE009CEEF8 /* SBJsonParser.m in Sources */,
- 84FA4276153E15EE009CEEF8 /* SBJsonWriter.m in Sources */,
+ 84FA4273153E15EE009CEEF8 /* FBSBJSON.m in Sources */,
+ 84FA4274153E15EE009CEEF8 /* FBSBJsonBase.m in Sources */,
+ 84FA4275153E15EE009CEEF8 /* FBSBJsonParser.m in Sources */,
+ 84FA4276153E15EE009CEEF8 /* FBSBJsonWriter.m in Sources */,
84FA427A153E1968009CEEF8 /* FBTestBlocker.m in Sources */,
843D2DDA1547C33000873F7C /* FBUtility.m in Sources */,
84B5F1151552E4AF00A55DDC /* FBSessionTests.m in Sources */,
@@ -766,12 +744,10 @@
AEA93B0C11D5293B000A4545 /* FBRequest.m in Sources */,
AEA93B1011D5293B000A4545 /* FBLoginDialog.m in Sources */,
AEA93B1211D5293B000A4545 /* FBDialog.m in Sources */,
- AEA93B2311D52959000A4545 /* NSObject+SBJSON.m in Sources */,
- AEA93B2511D52959000A4545 /* NSString+SBJSON.m in Sources */,
- AEA93B2711D52959000A4545 /* SBJSON.m in Sources */,
- AEA93B2911D52959000A4545 /* SBJsonBase.m in Sources */,
- AEA93B2B11D52959000A4545 /* SBJsonParser.m in Sources */,
- AEA93B2D11D52959000A4545 /* SBJsonWriter.m in Sources */,
+ AEA93B2711D52959000A4545 /* FBSBJSON.m in Sources */,
+ AEA93B2911D52959000A4545 /* FBSBJsonBase.m in Sources */,
+ AEA93B2B11D52959000A4545 /* FBSBJsonParser.m in Sources */,
+ AEA93B2D11D52959000A4545 /* FBSBJsonWriter.m in Sources */,
B9DC7F41151AB56100DF1158 /* FBProfilePictureView.m in Sources */,
E23E5A0C1521161900A011A8 /* FBError.m in Sources */,
E29B4E66152631FB00D1BE21 /* FBRequestBody.m in Sources */,
Please sign in to comment.
Something went wrong with that request. Please try again.