From c0a9f5f526a9e8f18426ea94ad41c00bbabe3756 Mon Sep 17 00:00:00 2001 From: Matt Date: Fri, 4 Jun 2010 18:39:04 -0400 Subject: [PATCH] Added iPhone OS support. --- JSON/MSOEngineGlobalHeader.h | 16 ++++++++++++++++ JSON/NSObject+SBJSON.h | 4 ++-- JSON/NSString+SBJSON.h | 4 ++-- JSON/SBJSON.h | 3 ++- JSON/SBJsonBase.h | 4 ++-- JSON/SBJsonParser.h | 3 ++- JSON/SBJsonWriter.h | 3 ++- MSOEngine.h | 3 ++- MSOEngine.m | 8 ++------ 9 files changed, 32 insertions(+), 16 deletions(-) create mode 100644 JSON/MSOEngineGlobalHeader.h diff --git a/JSON/MSOEngineGlobalHeader.h b/JSON/MSOEngineGlobalHeader.h new file mode 100644 index 0000000..92ec758 --- /dev/null +++ b/JSON/MSOEngineGlobalHeader.h @@ -0,0 +1,16 @@ +// +// MSOEngineGlobalHeader.h +// StackTop +// +// Created by Matt on 6/4/10. +// Copyright 2010 Matt's Apps. All rights reserved. +// + +#if TARGET_OS_IPHONE +#import +#import +#else +#import +#import + +#endif diff --git a/JSON/NSObject+SBJSON.h b/JSON/NSObject+SBJSON.h index ecf0ee4..1563d6f 100755 --- a/JSON/NSObject+SBJSON.h +++ b/JSON/NSObject+SBJSON.h @@ -27,8 +27,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#import - +//#import +#import "MSOEngineGlobalHeader.h" /** @brief Adds JSON generation to Foundation classes diff --git a/JSON/NSString+SBJSON.h b/JSON/NSString+SBJSON.h index fad7179..5ebb50c 100755 --- a/JSON/NSString+SBJSON.h +++ b/JSON/NSString+SBJSON.h @@ -27,8 +27,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#import - +//#import +#import "MSOEngineGlobalHeader.h" /** @brief Adds JSON parsing methods to NSString diff --git a/JSON/SBJSON.h b/JSON/SBJSON.h index 43d63c3..ed31306 100755 --- a/JSON/SBJSON.h +++ b/JSON/SBJSON.h @@ -27,7 +27,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#import +//#import +#import "MSOEngineGlobalHeader.h" #import "SBJsonParser.h" #import "SBJsonWriter.h" diff --git a/JSON/SBJsonBase.h b/JSON/SBJsonBase.h index 7b10844..316aef3 100755 --- a/JSON/SBJsonBase.h +++ b/JSON/SBJsonBase.h @@ -27,8 +27,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#import - +//#import +#import "MSOEngineGlobalHeader.h" extern NSString * SBJSONErrorDomain; diff --git a/JSON/SBJsonParser.h b/JSON/SBJsonParser.h index e95304d..5db2902 100755 --- a/JSON/SBJsonParser.h +++ b/JSON/SBJsonParser.h @@ -27,7 +27,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#import +//#import +#import "MSOEngineGlobalHeader.h" #import "SBJsonBase.h" /** diff --git a/JSON/SBJsonWriter.h b/JSON/SBJsonWriter.h index f6f5e17..a47971a 100755 --- a/JSON/SBJsonWriter.h +++ b/JSON/SBJsonWriter.h @@ -27,7 +27,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#import +//#import +#import "MSOEngineGlobalHeader.h" #import "SBJsonBase.h" /** diff --git a/MSOEngine.h b/MSOEngine.h index bfc9894..9b41796 100755 --- a/MSOEngine.h +++ b/MSOEngine.h @@ -6,7 +6,8 @@ // Copyright 2010 Matt's Apps. All rights reserved. // -#import +//#import +#import "MSOEngineGlobalHeader.h" #import "JSON.h" diff --git a/MSOEngine.m b/MSOEngine.m index c79db1e..8e3d942 100755 --- a/MSOEngine.m +++ b/MSOEngine.m @@ -18,8 +18,6 @@ -(NSString*)initWithDataforURL:(NSString *)data NSURLRequest *request = [NSURLRequest requestWithURL:[NSURL URLWithString:theURL]]; NSData *response = [NSURLConnection sendSynchronousRequest:request returningResponse:nil error:nil]; - - // Get JSON as a NSString from NSData response NSString *json_string = [[NSString alloc] initWithData:response encoding:NSUTF8StringEncoding]; return json_string; } @@ -58,8 +56,7 @@ -(NSArray *)connectMekThxBai:(NSString *)data firstkey:(NSString *)key1 secondke } } - - + return array; } @@ -248,8 +245,7 @@ -(NSArray*)getAnswers:(NSString *)key andData:(NSString *)data [array addObject:@" "]; } } - - return array; + return [array autorelease]; } -(NSString*)getVersion