Added iPhone OS support.

computermatt · Jun 4, 2010 · c0a9f5f · c0a9f5f
1 parent ec38007
commit c0a9f5f
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 16 deletions.
diff --git a/JSON/MSOEngineGlobalHeader.h 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 <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+#else
+#import <Cocoa/Cocoa.h>
+#import <Foundation/Foundation.h>
+
+#endif
diff --git 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 <Foundation/Foundation.h>
-
+//#import <Foundation/Foundation.h>
+#import "MSOEngineGlobalHeader.h"
 
 /**
  @brief Adds JSON generation to Foundation classes

diff --git 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 <Foundation/Foundation.h>
-
+//#import <Foundation/Foundation.h>
+#import "MSOEngineGlobalHeader.h"
 /**
  @brief Adds JSON parsing methods to NSString
  

diff --git 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 <Foundation/Foundation.h>
+//#import <Foundation/Foundation.h>
+#import "MSOEngineGlobalHeader.h"
 #import "SBJsonParser.h"
 #import "SBJsonWriter.h"
 

diff --git 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 <Foundation/Foundation.h>
-
+//#import <Foundation/Foundation.h>
+#import "MSOEngineGlobalHeader.h"
 extern NSString * SBJSONErrorDomain;
 
 

diff --git 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 <Foundation/Foundation.h>
+//#import <Foundation/Foundation.h>
+#import "MSOEngineGlobalHeader.h"
 #import "SBJsonBase.h"
 
 /**

diff --git 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 <Foundation/Foundation.h>
+//#import <Foundation/Foundation.h>
+#import "MSOEngineGlobalHeader.h"
 #import "SBJsonBase.h"
 
 /**

diff --git a/MSOEngine.h b/MSOEngine.h
@@ -6,7 +6,8 @@
 //  Copyright 2010 Matt's Apps. All rights reserved.
 //
 
-#import <Cocoa/Cocoa.h>
+//#import <Cocoa/Cocoa.h>
+#import "MSOEngineGlobalHeader.h"
 #import "JSON.h"
 
 

diff --git 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