Fixes to allow all headers to be compilable, except those requiring M…

…usicLibrary and MediaPlayer frameworks.
kennytm · Jun 6, 2010 · 33fb8ec · 33fb8ec
1 parent a9fc4af
commit 33fb8ec
Show file tree

Hide file tree

Showing 22 changed files with 42 additions and 302 deletions.
diff --git a/AccountSettings/AccountCreationProtocol.h b/AccountSettings/AccountCreationProtocol.h
@@ -6,8 +6,4 @@
  */
 
 
-
-@protocol AccountCreationProtocol
--(id)initWithBasicAccount:(id)basicAccount;
-@end
-
+#import <DataAccess/AccountCreationProtocol.h>
diff --git a/ActorKit/AKDispatchQueue.h b/ActorKit/AKDispatchQueue.h
@@ -6,7 +6,7 @@
 #import "ActorKit-Structs.h"
 #import <Foundation/NSObject.h>
 
-@class NSThread, NSConditionLock;
+@class NSThread, NSConditionLock, NSNumber, NSRunLoop;
 
 enum AKDispatchQueueState {
 	AKDispatchQueueState_Initialized = 0,

diff --git a/AppSupport/CPExclusiveLock.h b/AppSupport/CPExclusiveLock.h
@@ -23,6 +23,7 @@
 
 #import "NSLocking.h"
 #import <Foundation/NSObject.h>
+#import <Foundation/NSLock.h>
 
 @class NSString;
 

diff --git a/AppSupport/CPRegularExpression.h b/AppSupport/CPRegularExpression.h
@@ -9,6 +9,7 @@
 #import "NSCoding.h"
 #import "NSCopying.h"
 #import <Foundation/NSObject.h>
+#import <Foundation/NSRange.h>
 
 @class NSString;
 

diff --git a/DataAccess/DataAccess-Structs.h b/DataAccess/DataAccess-Structs.h
@@ -5,6 +5,9 @@
  * Source: /System/Library/PrivateFrameworks/DataAccess.framework/DataAccess
  */
 
+#import <SystemConfiguration/SystemConfiguration.h>
+#import <QuartzCore/QuartzCore.h>
+
 typedef struct __SecTrust SecTrust;
 
 typedef struct _xmlNs xmlNs;
@@ -62,8 +65,6 @@ typedef struct ldap ldap;
 
 typedef struct ldapmsg ldapmsg;
 
-typedef struct __SCDynamicStore* SCDynamicStoreRef;
-
 typedef struct CalDatabase CalDatabase;
 
 typedef struct _xmlSAXHandler {
@@ -400,16 +401,4 @@ typedef struct {
 	int _field1;
 } XXStruct_YWGUWB;
 
-typedef struct {
-	unsigned long _field1;
-	id* _field2;
-	unsigned long* _field3;
-	unsigned long _field4[5];
-} XXStruct_kFm5bA;
-
-typedef struct {
-	int _field1;
-	int _field2;
-} XXStruct_K5nmsA;
-
 
diff --git a/IOKit/IOKit.h b/IOKit/IOKit.h
@@ -0,0 +1 @@
+IOKitLib.h
diff --git a/Message/DAMailboxStreamingContentConsumer.h b/Message/DAMailboxStreamingContentConsumer.h
@@ -6,10 +6,4 @@
  */
 
 
-
-@protocol DAMailboxStreamingContentConsumer
--(BOOL)shouldBeginStreamingForMailMessage:(id)mailMessage format:(int)format;
--(void)consumeData:(char*)data length:(int)length format:(int)format mailMessage:(id)message;
--(void)didEndStreamingForMailMessage:(id)mailMessage;
-@end
-
+#import <DataAccess/DAMailboxStreamingContentConsumer.h>
diff --git a/Message/Message-Structs.h b/Message/Message-Structs.h
@@ -8,6 +8,8 @@
 #include <CoreFoundation/CoreFoundation.h>
 #include <pthread.h>
 #import <MIME/MIME.h>
+#import <SystemConfiguration/SystemConfiguration.h>
+#import <sqlite3.h>
 
 typedef struct {
 	int _field1;
@@ -115,16 +117,10 @@ typedef struct {
 	unsigned _field12;
 } XXStruct_sY4QuD;
 
-typedef struct sqlite3 sqlite3;
-
 typedef struct NtlmGenerator NtlmGenerator;
 
 typedef struct _lockdown_connection lockdown_connection;
 
-typedef struct sqlite3_stmt sqlite3_stmt;
-
-typedef struct __SCDynamicStore* SCDynamicStoreRef;
-
 typedef struct {
 	unsigned colorHasBeenEvaluated : 1;
 	unsigned colorWasSetManually : 1;

diff --git a/PhotoLibrary/NSObject.h b/PhotoLibrary/NSObject.h
@@ -5,28 +5,4 @@
  * Source: /System/Library/PrivateFrameworks/PhotoLibrary.framework/PhotoLibrary
  */
 
-#import "PhotoLibrary-Structs.h"
-
-
-@protocol NSObject
--(BOOL)isEqual:(id)equal;
--(unsigned)hash;
--(Class)superclass;
--(Class)class;
--(id)self;
--(NSZone*)zone;
--(id)performSelector:(SEL)selector;
--(id)performSelector:(SEL)selector withObject:(id)object;
--(id)performSelector:(SEL)selector withObject:(id)object withObject:(id)object3;
--(BOOL)isProxy;
--(BOOL)isKindOfClass:(Class)aClass;
--(BOOL)isMemberOfClass:(Class)aClass;
--(BOOL)conformsToProtocol:(id)protocol;
--(BOOL)respondsToSelector:(SEL)selector;
--(id)retain;
--(oneway void)release;
--(id)autorelease;
--(unsigned)retainCount;
--(id)description;
-@end
-
+#import <Foundation/NSObject.h>
diff --git a/PhotoLibrary/PLImageTile.h b/PhotoLibrary/PLImageTile.h
@@ -5,6 +5,10 @@
  * Source: /System/Library/PrivateFrameworks/PhotoLibrary.framework/PhotoLibrary
  */
 
+#import <Availability2.h>
+
+#if __IPHONE_OS_VERSION_MAX_ALLOWED < __IPHONE_3_2
+
 #import "PLImageTile.h"
 #import "PhotoLibrary-Structs.h"
 #import <UIKit/UITile.h>
@@ -54,3 +58,4 @@
 -(int)_imageOrientation;
 @end
 
+#endif
diff --git a/PhotoLibrary/PLImageTileView.h b/PhotoLibrary/PLImageTileView.h
@@ -5,6 +5,11 @@
  * Source: /System/Library/PrivateFrameworks/PhotoLibrary.framework/PhotoLibrary
  */
 
+#import <Availability2.h>
+
+#if __IPHONE_OS_VERSION_MAX_ALLOWED < __IPHONE_3_2
+
+
 #import "PhotoLibrary-Structs.h"
 #import <UIKit/UITiledView.h>
 
@@ -31,3 +36,4 @@
 // inherited: -(void)mouseDragged:(GSEventRef)dragged;
 @end
 
+#endif
diff --git a/PhotoLibrary/PLTVOutImageTile.h b/PhotoLibrary/PLTVOutImageTile.h
@@ -5,6 +5,10 @@
  * Source: /System/Library/PrivateFrameworks/PhotoLibrary.framework/PhotoLibrary
  */
 
+#import <Availability2.h>
+
+#if __IPHONE_OS_VERSION_MAX_ALLOWED < __IPHONE_3_2
+
 #import "PhotoLibrary-Structs.h"
 #import "PLImageTile.h"
 
@@ -15,3 +19,4 @@
 // inherited: -(CGRect)imageRect;
 @end
 
+#endif
diff --git a/PhotoLibrary/PhotoLibrary-Structs.h b/PhotoLibrary/PhotoLibrary-Structs.h
@@ -5,61 +5,11 @@
  * Source: /System/Library/PrivateFrameworks/PhotoLibrary.framework/PhotoLibrary
  */
 
-typedef struct _NSZone NSZone;
-
-typedef struct __CFData* CFDataRef;
-
-typedef struct CGContext* CGContextRef;
-
-typedef struct CGAffineTransform {
-	float a;
-	float b;
-	float c;
-	float d;
-	float tx;
-	float ty;
-} CGAffineTransform;
-
-typedef struct _NSRange {
-	unsigned location;
-	unsigned length;
-} NSRange;
-
-typedef struct __GSEvent* GSEventRef;
-
-typedef struct CGImage* CGImageRef;
-
-typedef struct CGPoint {
-	float x;
-	float y;
-} CGPoint;
-
-typedef struct CGSize {
-	float width;
-	float height;
-} CGSize;
-
-typedef struct CGRect {
-	CGPoint origin;
-	CGSize size;
-} CGRect;
-
-typedef struct {
-	int _field1;
-	int _field2;
-	id _field3;
-	id _field4;
-	float _field5;
-	int _field6;
-	SEL _field7;
-	id _field8;
-} XXStruct_b4LybD;
-
-typedef struct __CFMessagePort* CFMessagePortRef;
-
-typedef struct __CFDictionary* CFDictionaryRef;
-
-typedef struct __CFArray* CFArrayRef;
+#import <Foundation/Foundation.h>
+#import <CoreGraphics/CoreGraphics.h>
+#import <GraphicsServices/GraphicsServices.h>
+#import <UIKit/UIKit.h>
+#import <ImageIO/ImageIO.h>
 
 typedef struct {
 	id _field1;
@@ -68,71 +18,9 @@ typedef struct {
 	float _field4;
 } XXStruct_z8YKPA;
 
-typedef struct __CFString* CFStringRef;
-
-typedef struct UIEdgeInsets {
-	float top;
-	float left;
-	float bottom;
-	float right;
-} UIEdgeInsets;
-
-typedef struct CGImageSource* CGImageSourceRef;
-
-typedef struct __CFRunLoopSource* CFRunLoopSourceRef;
-
-typedef struct {
-	int version;
-	void* info;
-	/*function-pointer*/ void* retain;
-	/*function-pointer*/ void* release;
-	/*function-pointer*/ void* copyDescription;
-} XXStruct_4pnlqD;
-
-typedef struct __CFRunLoop* CFRunLoopRef;
-
-typedef struct CGPath* CGPathRef;
-
-typedef struct CGColor* CGColorRef;
-
 typedef struct {
 	CGRect _field1;
 	CGRect _field2;
 	CGRect _field3;
 } XXStruct_SIyEID;
 
-typedef struct {
-	BOOL _field1;
-	BOOL _field2;
-	BOOL _field3;
-	float _field4;
-	float _field5;
-	int _field6;
-	CGRect _field7;
-	CGRect _field8;
-} XXStruct_TF$i3B;
-
-typedef struct {
-	BOOL _field1;
-	union {
-		struct {
-			id _field1;
-			id _field2;
-		} _field1;
-		GSEventRef _field2;
-	} _field2;
-} XXStruct_CKAdxD;
-
-typedef struct {
-	int _field1;
-	int _field2;
-} XXStruct_K5nmsA;
-
-typedef struct {
-	unsigned long _field1;
-	id* _field2;
-	unsigned long* _field3;
-	unsigned long _field4[5];
-} XXStruct_kFm5bA;
-
-
diff --git a/PhotoLibrary/UIActionSheetDelegate.h b/PhotoLibrary/UIActionSheetDelegate.h
@@ -5,16 +5,4 @@
  * Source: /System/Library/PrivateFrameworks/PhotoLibrary.framework/PhotoLibrary
  */
 
-#import "NSObject.h"
-
-
-@protocol UIActionSheetDelegate <NSObject>
-@optional
--(void)actionSheet:(id)sheet clickedButtonAtIndex:(int)index;
--(void)actionSheetCancel:(id)cancel;
--(void)willPresentActionSheet:(id)sheet;
--(void)didPresentActionSheet:(id)sheet;
--(void)actionSheet:(id)sheet willDismissWithButtonIndex:(int)buttonIndex;
--(void)actionSheet:(id)sheet didDismissWithButtonIndex:(int)buttonIndex;
-@end
-
+#import <UIKit/UIAlert.h>
diff --git a/PhotoLibrary/UIModalViewDelegate.h b/PhotoLibrary/UIModalViewDelegate.h
@@ -5,16 +5,4 @@
  * Source: /System/Library/PrivateFrameworks/PhotoLibrary.framework/PhotoLibrary
  */
 
-#import "NSObject.h"
-
-
-@protocol UIModalViewDelegate <NSObject>
-@optional
--(void)modalView:(id)view clickedButtonAtIndex:(int)index;
--(void)modalViewCancel:(id)cancel;
--(void)willPresentModalView:(id)view;
--(void)didPresentModalView:(id)view;
--(void)modalView:(id)view willDismissWithButtonIndex:(int)buttonIndex;
--(void)modalView:(id)view didDismissWithButtonIndex:(int)buttonIndex;
-@end
-
+#import <UIKit/UIModalViewDelegate.h>
diff --git a/PhotoLibrary/UINavigationControllerDelegate.h b/PhotoLibrary/UINavigationControllerDelegate.h
@@ -5,12 +5,4 @@
  * Source: /System/Library/PrivateFrameworks/PhotoLibrary.framework/PhotoLibrary
  */
 
-#import "NSObject.h"
-
-
-@protocol UINavigationControllerDelegate <NSObject>
-@optional
--(void)navigationController:(id)controller willShowViewController:(id)controller2 animated:(BOOL)animated;
--(void)navigationController:(id)controller didShowViewController:(id)controller2 animated:(BOOL)animated;
-@end
-
+#import <UIKit/UINavigationController.h>