From 63755c48fd5fe4f31775e0f38857314879b93f39 Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Wed, 15 Feb 2017 01:38:42 -0800 Subject: Move more of sysroot's sadness into iPhonePrivate. --- CyteKit/IndirectDelegate.h | 2 ++ CyteKit/TabBarController.h | 1 - CyteKit/TabBarController.mm | 2 ++ CyteKit/TableViewCell.h | 2 -- CyteKit/TableViewCell.mm | 2 ++ CyteKit/ViewController.h | 2 -- CyteKit/ViewController.mm | 4 +++- CyteKit/WebScriptObject-Cyte.h | 2 +- CyteKit/WebScriptObject-Cyte.mm | 4 ++++ CyteKit/WebView.h | 11 +++++------ CyteKit/WebView.mm | 2 ++ CyteKit/WebViewController.mm | 23 ++++++----------------- CyteKit/WebViewTableViewCell.mm | 3 +++ CyteKit/dispatchEvent.mm | 8 ++------ CyteKit/stringWithUTF8Bytes.mm | 2 ++ 15 files changed, 34 insertions(+), 36 deletions(-) (limited to 'CyteKit') diff --git a/CyteKit/IndirectDelegate.h b/CyteKit/IndirectDelegate.h index 42bbd0a..ae698cb 100644 --- a/CyteKit/IndirectDelegate.h +++ b/CyteKit/IndirectDelegate.h @@ -22,6 +22,8 @@ #ifndef CyteKit_IndirectDelegate_H #define CyteKit_IndirectDelegate_H +#include + @interface IndirectDelegate : NSObject { _transient volatile id delegate_; } diff --git a/CyteKit/TabBarController.h b/CyteKit/TabBarController.h index cea17d2..2849b4b 100644 --- a/CyteKit/TabBarController.h +++ b/CyteKit/TabBarController.h @@ -22,7 +22,6 @@ #ifndef CyteKit_TabBarController_H #define CyteKit_TabBarController_H -#include #include #include diff --git a/CyteKit/TabBarController.mm b/CyteKit/TabBarController.mm index bb3d98b..27a8000 100644 --- a/CyteKit/TabBarController.mm +++ b/CyteKit/TabBarController.mm @@ -19,6 +19,8 @@ **/ /* }}} */ +#include "CyteKit/UCPlatform.h" + #include "CyteKit/TabBarController.h" #include "iPhonePrivate.h" diff --git a/CyteKit/TableViewCell.h b/CyteKit/TableViewCell.h index 46333aa..f97a592 100644 --- a/CyteKit/TableViewCell.h +++ b/CyteKit/TableViewCell.h @@ -22,8 +22,6 @@ #ifndef CyteKit_TableViewCell_H #define CyteKit_TableViewCell_H -#include - #include #include diff --git a/CyteKit/TableViewCell.mm b/CyteKit/TableViewCell.mm index b4c4a4c..ce61ad5 100644 --- a/CyteKit/TableViewCell.mm +++ b/CyteKit/TableViewCell.mm @@ -19,6 +19,8 @@ **/ /* }}} */ +#include "CyteKit/UCPlatform.h" + #include "CyteKit/TableViewCell.h" #include "iPhonePrivate.h" diff --git a/CyteKit/ViewController.h b/CyteKit/ViewController.h index 7cc550e..f724837 100644 --- a/CyteKit/ViewController.h +++ b/CyteKit/ViewController.h @@ -22,8 +22,6 @@ #ifndef CyteKit_ViewController_H #define CyteKit_ViewController_H -#include - #include #include diff --git a/CyteKit/ViewController.mm b/CyteKit/ViewController.mm index ae7539c..3bf9c41 100644 --- a/CyteKit/ViewController.mm +++ b/CyteKit/ViewController.mm @@ -19,11 +19,13 @@ **/ /* }}} */ -#include "CyteKit/ViewController.h" +#include "CyteKit/UCPlatform.h" #include #include +#include "CyteKit/ViewController.h" + #include "iPhonePrivate.h" @implementation UIViewController (Cydia) diff --git a/CyteKit/WebScriptObject-Cyte.h b/CyteKit/WebScriptObject-Cyte.h index a7ffa29..6a394bc 100644 --- a/CyteKit/WebScriptObject-Cyte.h +++ b/CyteKit/WebScriptObject-Cyte.h @@ -22,7 +22,7 @@ #ifndef CyteKit_WebScriptObject_Cyte_H #define CyteKit_WebScriptObject_Cyte_H -#include +#include "iPhonePrivate.h" @interface WebScriptObject (Cyte) - (NSUInteger) count; diff --git a/CyteKit/WebScriptObject-Cyte.mm b/CyteKit/WebScriptObject-Cyte.mm index df1bfca..7fa851d 100644 --- a/CyteKit/WebScriptObject-Cyte.mm +++ b/CyteKit/WebScriptObject-Cyte.mm @@ -19,8 +19,12 @@ **/ /* }}} */ +#include "CyteKit/UCPlatform.h" + #include "CyteKit/WebScriptObject-Cyte.h" +#include "iPhonePrivate.h" + @implementation WebScriptObject (Cyte) - (NSUInteger) count { diff --git a/CyteKit/WebView.h b/CyteKit/WebView.h index 02fce72..ddf4391 100644 --- a/CyteKit/WebView.h +++ b/CyteKit/WebView.h @@ -24,13 +24,12 @@ #include -#include -#include -#include -#include -#include +@protocol WebPolicyDecisionListener; -#include +@class WebDataSource; +@class WebFrame; +@class WebScriptObject; +@class WebView; enum CYWebPolicyDecision { CYWebPolicyDecisionUnknown, diff --git a/CyteKit/WebView.mm b/CyteKit/WebView.mm index 09bb4c7..38f6a4f 100644 --- a/CyteKit/WebView.mm +++ b/CyteKit/WebView.mm @@ -19,6 +19,8 @@ **/ /* }}} */ +#include "CyteKit/UCPlatform.h" + #include "CyteKit/dispatchEvent.h" #include "CyteKit/WebView.h" diff --git a/CyteKit/WebViewController.mm b/CyteKit/WebViewController.mm index 6692c6c..18b40d9 100644 --- a/CyteKit/WebViewController.mm +++ b/CyteKit/WebViewController.mm @@ -1,15 +1,13 @@ #include "CyteKit/UCPlatform.h" -#include "CyteKit/WebViewController.h" - -#include "CyteKit/MFMailComposeViewController-MailToURL.h" - -#include "iPhonePrivate.h" #include "CyteKit/IndirectDelegate.h" #include "CyteKit/Localize.h" -#include "CyteKit/WebViewController.h" +#include "CyteKit/MFMailComposeViewController-MailToURL.h" #include "CyteKit/RegEx.hpp" #include "CyteKit/WebThreadLocked.hpp" +#include "CyteKit/WebViewController.h" + +#include "iPhonePrivate.h" //#include // XXX: fix the minimum requirement @@ -17,15 +15,6 @@ extern NSString * const kCAFilterNearest; #include -#import -#import - -#include -#include -#include -#include -#include - #include #include @@ -683,7 +672,7 @@ float CYScrollViewDecelerationRateNormal; [alert addTextFieldWithValue:@"" label:UCLocalize("PASSWORD")]; UITextField *username([alert textFieldAtIndex:0]); { - UITextInputTraits *traits([username textInputTraits]); + NSObject *traits([username textInputTraits]); [traits setAutocapitalizationType:UITextAutocapitalizationTypeNone]; [traits setAutocorrectionType:UITextAutocorrectionTypeNo]; [traits setKeyboardType:UIKeyboardTypeASCIICapable]; @@ -691,7 +680,7 @@ float CYScrollViewDecelerationRateNormal; } UITextField *password([alert textFieldAtIndex:1]); { - UITextInputTraits *traits([password textInputTraits]); + NSObject *traits([password textInputTraits]); [traits setAutocapitalizationType:UITextAutocapitalizationTypeNone]; [traits setAutocorrectionType:UITextAutocorrectionTypeNo]; [traits setKeyboardType:UIKeyboardTypeASCIICapable]; diff --git a/CyteKit/WebViewTableViewCell.mm b/CyteKit/WebViewTableViewCell.mm index ebba58a..3756a0f 100644 --- a/CyteKit/WebViewTableViewCell.mm +++ b/CyteKit/WebViewTableViewCell.mm @@ -19,7 +19,10 @@ **/ /* }}} */ +#include "CyteKit/UCPlatform.h" + #include "CyteKit/WebViewTableViewCell.h" + #include "iPhonePrivate.h" @implementation CyteWebViewTableViewCell diff --git a/CyteKit/dispatchEvent.mm b/CyteKit/dispatchEvent.mm index 9efe1cb..f36be8c 100644 --- a/CyteKit/dispatchEvent.mm +++ b/CyteKit/dispatchEvent.mm @@ -19,15 +19,11 @@ **/ /* }}} */ +#include "CyteKit/UCPlatform.h" + #include "CyteKit/dispatchEvent.h" #include "CyteKit/WebThreadLocked.hpp" -#include - -#include -#include -#include - #include "Substrate.hpp" @implementation UIWebDocumentView (CyteDispatchEvent) diff --git a/CyteKit/stringWithUTF8Bytes.mm b/CyteKit/stringWithUTF8Bytes.mm index 94fe1ed..2e94dd4 100644 --- a/CyteKit/stringWithUTF8Bytes.mm +++ b/CyteKit/stringWithUTF8Bytes.mm @@ -19,6 +19,8 @@ **/ /* }}} */ +#include "CyteKit/UCPlatform.h" + #include "CyteKit/stringWithUTF8Bytes.h" @implementation NSString (Cyte) -- cgit v1.2.3