Added GlobalHeader from MGTE to conditionally include either Cocoa.h …

…or UIKit.h depending on target OS.
owainhunt · Aug 3, 2010 · f039a4f · f039a4f
1 parent a6b2e5d
commit f039a4f
Show file tree

Hide file tree

Showing 22 changed files with 51 additions and 125 deletions.
diff --git a/AppController.h b/AppController.h
@@ -6,7 +6,8 @@
 //  Copyright 2010 Owain R Hunt. All rights reserved.
 //
 
-#import <Cocoa/Cocoa.h>
+#import "UAGithubEngineGlobalHeader.h"
+
 #import "UAGithubEngine.h"
 
 

diff --git a/Experimental/CExtensibleJSONDataSerializer.h b/Experimental/CExtensibleJSONDataSerializer.h
diff --git a/Experimental/CExtensibleJSONDataSerializer.m b/Experimental/CExtensibleJSONDataSerializer.m
diff --git a/NSArray+Utilities.h b/NSArray+Utilities.h
@@ -6,7 +6,8 @@
 //  Copyright 2010 Owain R Hunt. All rights reserved.
 //
 
-#import <Cocoa/Cocoa.h>
+#import "UAGithubEngineGlobalHeader.h"
+
 
 
 @interface NSArray (Utilities) 

diff --git a/NSString+UAGithubEngineUtilities.h b/NSString+UAGithubEngineUtilities.h
@@ -6,7 +6,8 @@
 //  Copyright 2010 Owain R Hunt. All rights reserved.
 //
 
-#import <Cocoa/Cocoa.h>
+#import "UAGithubEngineGlobalHeader.h"
+
 
 
 @interface NSString(UAGithubEngineUtilities)

diff --git a/UAGithubCommitsJSONParser.h b/UAGithubCommitsJSONParser.h
@@ -6,7 +6,8 @@
 //  Copyright 2010 Owain R Hunt. All rights reserved.
 //
 
-#import <Cocoa/Cocoa.h>
+#import "UAGithubEngineGlobalHeader.h"
+
 #import "UAGithubJSONParser.h"
 
 

diff --git a/UAGithubEngine.h b/UAGithubEngine.h
@@ -6,7 +6,7 @@
 //  Copyright 2010 Owain R Hunt. All rights reserved.
 //
 
-#import <Cocoa/Cocoa.h>
+#import "UAGithubEngineGlobalHeader.h"
 #import "UAGithubEngineDelegate.h"
 #import "UAGithubEngineRequestTypes.h"
 #import "UAGithubParserDelegate.h"

diff --git a/UAGithubEngine.m b/UAGithubEngine.m
@@ -7,7 +7,14 @@
 //
 
 #import "UAGithubEngine.h"
-#import "UAGithubJSONParserHeader.h"
+#import "UAGithubParserDelegate.h"
+#import "UAGithubSimpleJSONParser.h"
+#import "UAGithubUsersJSONParser.h"
+#import "UAGithubRepositoriesJSONParser.h"
+#import "UAGithubCommitsJSONParser.h"
+#import "UAGithubIssuesJSONParser.h"
+#import "UAGithubIssueCommentsJSONParser.h"
+#import "CJSONDeserializer.h"
 #import "UAGithubEngineRequestTypes.h"
 #import "UAGithubURLConnection.h"
 

diff --git a/UAGithubEngine.xcodeproj/project.pbxproj b/UAGithubEngine.xcodeproj/project.pbxproj
@@ -10,7 +10,6 @@
 		1DDD58160DA1D0A300B32029 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1DDD58140DA1D0A300B32029 /* MainMenu.xib */; };
 		256AC3DA0F4B6AC300CF3369 /* AppController.m in Sources */ = {isa = PBXBuildFile; fileRef = 256AC3D90F4B6AC300CF3369 /* AppController.m */; };
 		6839D05711FE2AED009AB715 /* CDataScanner.m in Sources */ = {isa = PBXBuildFile; fileRef = 6839D03F11FE2AED009AB715 /* CDataScanner.m */; };
-		6839D05811FE2AED009AB715 /* CExtensibleJSONDataSerializer.m in Sources */ = {isa = PBXBuildFile; fileRef = 6839D04211FE2AED009AB715 /* CExtensibleJSONDataSerializer.m */; };
 		6839D05911FE2AED009AB715 /* CDataScanner_Extensions.m in Sources */ = {isa = PBXBuildFile; fileRef = 6839D04511FE2AED009AB715 /* CDataScanner_Extensions.m */; };
 		6839D05A11FE2AED009AB715 /* NSCharacterSet_Extensions.m in Sources */ = {isa = PBXBuildFile; fileRef = 6839D04711FE2AED009AB715 /* NSCharacterSet_Extensions.m */; };
 		6839D05B11FE2AED009AB715 /* NSDictionary_JSONExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = 6839D04911FE2AED009AB715 /* NSDictionary_JSONExtensions.m */; };
@@ -49,8 +48,6 @@
 		29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
 		6839D03E11FE2AED009AB715 /* CDataScanner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDataScanner.h; sourceTree = "<group>"; };
 		6839D03F11FE2AED009AB715 /* CDataScanner.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CDataScanner.m; sourceTree = "<group>"; };
-		6839D04111FE2AED009AB715 /* CExtensibleJSONDataSerializer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CExtensibleJSONDataSerializer.h; sourceTree = "<group>"; };
-		6839D04211FE2AED009AB715 /* CExtensibleJSONDataSerializer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CExtensibleJSONDataSerializer.m; sourceTree = "<group>"; };
 		6839D04411FE2AED009AB715 /* CDataScanner_Extensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDataScanner_Extensions.h; sourceTree = "<group>"; };
 		6839D04511FE2AED009AB715 /* CDataScanner_Extensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CDataScanner_Extensions.m; sourceTree = "<group>"; };
 		6839D04611FE2AED009AB715 /* NSCharacterSet_Extensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSCharacterSet_Extensions.h; sourceTree = "<group>"; };
@@ -79,7 +76,7 @@
 		6879ABAF11FF40E800F29BDE /* UAGithubRepositoriesJSONParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UAGithubRepositoriesJSONParser.m; sourceTree = "<group>"; };
 		6879ABFF11FF43DA00F29BDE /* NSArray+Utilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSArray+Utilities.h"; sourceTree = "<group>"; };
 		6879AC0011FF43DA00F29BDE /* NSArray+Utilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSArray+Utilities.m"; sourceTree = "<group>"; };
-		688D0EDA120868E80044D558 /* UAGithubJSONParserHeader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UAGithubJSONParserHeader.h; sourceTree = "<group>"; };
+		688D0F6F12087D010044D558 /* UAGithubEngineGlobalHeader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UAGithubEngineGlobalHeader.h; sourceTree = "<group>"; };
 		688ECC8D1200A9240087ADB3 /* UAGithubIssuesJSONParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UAGithubIssuesJSONParser.h; sourceTree = "<group>"; };
 		688ECC8E1200A9240087ADB3 /* UAGithubIssuesJSONParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UAGithubIssuesJSONParser.m; sourceTree = "<group>"; };
 		688ECC901200A9350087ADB3 /* UAGithubIssueCommentsJSONParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UAGithubIssueCommentsJSONParser.h; sourceTree = "<group>"; };
@@ -194,22 +191,12 @@
 			children = (
 				6839D03E11FE2AED009AB715 /* CDataScanner.h */,
 				6839D03F11FE2AED009AB715 /* CDataScanner.m */,
-				6839D04011FE2AED009AB715 /* Experimental */,
 				6839D04311FE2AED009AB715 /* Extensions */,
 				6839D04C11FE2AED009AB715 /* JSON */,
 			);
 			name = TouchJSON;
 			sourceTree = "<group>";
 		};
-		6839D04011FE2AED009AB715 /* Experimental */ = {
-			isa = PBXGroup;
-			children = (
-				6839D04111FE2AED009AB715 /* CExtensibleJSONDataSerializer.h */,
-				6839D04211FE2AED009AB715 /* CExtensibleJSONDataSerializer.m */,
-			);
-			path = Experimental;
-			sourceTree = "<group>";
-		};
 		6839D04311FE2AED009AB715 /* Extensions */ = {
 			isa = PBXGroup;
 			children = (
@@ -288,7 +275,7 @@
 		68E72ADD116652530069B287 /* Engine */ = {
 			isa = PBXGroup;
 			children = (
-				688D0EDA120868E80044D558 /* UAGithubJSONParserHeader.h */,
+				688D0F6F12087D010044D558 /* UAGithubEngineGlobalHeader.h */,
 				68E72AE0116653770069B287 /* UAGithubEngine.h */,
 				68E72AE1116653770069B287 /* UAGithubEngine.m */,
 				68E72ADC116652450069B287 /* UAGithubEngineDelegate.h */,
@@ -366,7 +353,6 @@
 				68D35B121186049900C6E37E /* UAGithubURLConnection.m in Sources */,
 				68D35B191186070300C6E37E /* NSString+UUID.m in Sources */,
 				6839D05711FE2AED009AB715 /* CDataScanner.m in Sources */,
-				6839D05811FE2AED009AB715 /* CExtensibleJSONDataSerializer.m in Sources */,
 				6839D05911FE2AED009AB715 /* CDataScanner_Extensions.m in Sources */,
 				6839D05A11FE2AED009AB715 /* NSCharacterSet_Extensions.m in Sources */,
 				6839D05B11FE2AED009AB715 /* NSDictionary_JSONExtensions.m in Sources */,

diff --git a/UAGithubEngineDelegate.h b/UAGithubEngineDelegate.h
@@ -6,7 +6,7 @@
 //  Copyright 2010 Owain R Hunt. All rights reserved.
 //
 
-#import <Cocoa/Cocoa.h>
+#import "UAGithubEngineGlobalHeader.h"
 
 
 @protocol UAGithubEngineDelegate <NSObject>

diff --git a/UAGithubEngineGlobalHeader.h b/UAGithubEngineGlobalHeader.h
@@ -0,0 +1,16 @@
+/*
+ *  UAGithubEngineGlobalHeader.h
+ *  UAGithubEngine
+ *
+ *  Created by Owain Hunt on 03/08/2010.
+ *  Copyright 2010 Owain R Hunt. All rights reserved.
+ *
+ */
+
+#if TARGET_OS_IPHONE
+	#import <Foundation/Foundation.h>
+	#import <UIKit/UIKit.h>
+#else
+	#import "UAGithubEngineGlobalHeader.h"
+
+#endif
diff --git a/UAGithubEngine_Prefix.pch b/UAGithubEngine_Prefix.pch
@@ -6,4 +6,5 @@
     #import <Cocoa/Cocoa.h>
 	#import "NSString+UAGithubEngineUtilities.h"
 	#import "NSArray+Utilities.h"
+
 #endif
diff --git a/UAGithubIssueCommentsJSONParser.h b/UAGithubIssueCommentsJSONParser.h
@@ -6,7 +6,8 @@
 //  Copyright 2010 Owain R Hunt. All rights reserved.
 //
 
-#import <Cocoa/Cocoa.h>
+#import "UAGithubEngineGlobalHeader.h"
+
 #import "UAGithubJSONParser.h"
 
 

diff --git a/UAGithubIssuesJSONParser.h b/UAGithubIssuesJSONParser.h
@@ -6,7 +6,8 @@
 //  Copyright 2010 Owain R Hunt. All rights reserved.
 //
 
-#import <Cocoa/Cocoa.h>
+#import "UAGithubEngineGlobalHeader.h"
+
 #import "UAGithubJSONParser.h"
 
 

diff --git a/UAGithubJSONParser.h b/UAGithubJSONParser.h
@@ -6,7 +6,7 @@
 //  Copyright 2010 Owain R Hunt. All rights reserved.
 //
 
-#import <Cocoa/Cocoa.h>
+#import "UAGithubEngineGlobalHeader.h"
 #import "UAGithubParserDelegate.h"
 #import "UAGithubEngineRequestTypes.h"
 

diff --git a/UAGithubJSONParser.m b/UAGithubJSONParser.m
@@ -21,6 +21,7 @@ - (id)initWithJSON:(NSData *)theJSON delegate:(id)theDelegate connectionIdentifi
         requestType = reqType;
 		responseType = respType;
     }
+
     return self;
 
 }

diff --git a/UAGithubJSONParserHeader.h b/UAGithubJSONParserHeader.h
diff --git a/UAGithubParserDelegate.h b/UAGithubParserDelegate.h
@@ -6,7 +6,7 @@
 //  Copyright 2010 Owain R Hunt. All rights reserved.
 //
 
-#import <Cocoa/Cocoa.h>
+#import "UAGithubEngineGlobalHeader.h"
 #import "UAGithubEngineRequestTypes.h"
 
 

diff --git a/UAGithubRepositoriesJSONParser.h b/UAGithubRepositoriesJSONParser.h
@@ -6,7 +6,8 @@
 //  Copyright 2010 Owain R Hunt. All rights reserved.
 //
 
-#import <Cocoa/Cocoa.h>
+#import "UAGithubEngineGlobalHeader.h"
+
 #import "UAGithubJSONParser.h"
 
 @interface UAGithubRepositoriesJSONParser : UAGithubJSONParser {

diff --git a/UAGithubSimpleJSONParser.h b/UAGithubSimpleJSONParser.h
@@ -6,7 +6,8 @@
 //  Copyright 2010 Owain R Hunt. All rights reserved.
 //
 
-#import <Cocoa/Cocoa.h>
+#import "UAGithubEngineGlobalHeader.h"
+
 #import "UAGithubJSONParser.h"
 
 @interface UAGithubSimpleJSONParser : UAGithubJSONParser {

diff --git a/UAGithubURLConnection.h b/UAGithubURLConnection.h
@@ -6,7 +6,7 @@
 //  Copyright 2010 Owain R Hunt. All rights reserved.
 //
 
-#import <Cocoa/Cocoa.h>
+#import "UAGithubEngineGlobalHeader.h"
 #import "UAGithubEngineRequestTypes.h"
 
 @interface UAGithubURLConnection : NSURLConnection 

diff --git a/UAGithubUsersJSONParser.h b/UAGithubUsersJSONParser.h
@@ -6,7 +6,8 @@
 //  Copyright 2010 Owain R Hunt. All rights reserved.
 //
 
-#import <Cocoa/Cocoa.h>
+#import "UAGithubEngineGlobalHeader.h"
+
 #import "UAGithubJSONParser.h"
 
 @interface UAGithubUsersJSONParser : UAGithubJSONParser {