Move more of sysroot's sadness into iPhonePrivate.

[cydia.git] / CyteKit / WebViewController.mm

diff --git a/CyteKit/WebViewController.mm b/CyteKit/WebViewController.mm
index 6692c6cbe232604b39c06641a14f8181b4b3fce7..18b40d945ca68943aafe83911d97dc6fe954c160 100644 (file)
--- a/CyteKit/WebViewController.mm
+++ b/CyteKit/WebViewController.mm
@@ -1,15 +1,13 @@
 #include "CyteKit/UCPlatform.h"
 #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/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/RegEx.hpp"
 #include "CyteKit/WebThreadLocked.hpp"

+#include "CyteKit/WebViewController.h"
+
+#include "iPhonePrivate.h"

 
 //#include <QuartzCore/CALayer.h>
 // XXX: fix the minimum requirement
 
 //#include <QuartzCore/CALayer.h>
 // XXX: fix the minimum requirement


@@ -17,15 +15,6 @@ extern NSString * const kCAFilterNearest;
 
 #include <WebCore/WebCoreThread.h>
 
 
 #include <WebCore/WebCoreThread.h>
 

-#import <WebKit/WebKitErrors.h>
-#import <WebKit/WebPreferences.h>
-
-#include <WebKit/DOMCSSPrimitiveValue.h>
-#include <WebKit/DOMCSSStyleDeclaration.h>
-#include <WebKit/DOMDocument.h>
-#include <WebKit/DOMHTMLBodyElement.h>
-#include <WebKit/DOMRGBColor.h>
-

 #include <dlfcn.h>
 #include <objc/runtime.h>
 
 #include <dlfcn.h>
 #include <objc/runtime.h>
 


@@ -683,7 +672,7 @@ float CYScrollViewDecelerationRateNormal;
     [alert addTextFieldWithValue:@"" label:UCLocalize("PASSWORD")];
 
     UITextField *username([alert textFieldAtIndex:0]); {
     [alert addTextFieldWithValue:@"" label:UCLocalize("PASSWORD")];
 
     UITextField *username([alert textFieldAtIndex:0]); {

-        UITextInputTraits *traits([username textInputTraits]);
+        NSObject<UITextInputTraits> *traits([username textInputTraits]);

         [traits setAutocapitalizationType:UITextAutocapitalizationTypeNone];
         [traits setAutocorrectionType:UITextAutocorrectionTypeNo];
         [traits setKeyboardType:UIKeyboardTypeASCIICapable];
         [traits setAutocapitalizationType:UITextAutocapitalizationTypeNone];
         [traits setAutocorrectionType:UITextAutocorrectionTypeNo];
         [traits setKeyboardType:UIKeyboardTypeASCIICapable];


@@ -691,7 +680,7 @@ float CYScrollViewDecelerationRateNormal;
     }
 
     UITextField *password([alert textFieldAtIndex:1]); {
     }
 
     UITextField *password([alert textFieldAtIndex:1]); {

-        UITextInputTraits *traits([password textInputTraits]);
+        NSObject<UITextInputTraits> *traits([password textInputTraits]);

         [traits setAutocapitalizationType:UITextAutocapitalizationTypeNone];
         [traits setAutocorrectionType:UITextAutocorrectionTypeNo];
         [traits setKeyboardType:UIKeyboardTypeASCIICapable];
         [traits setAutocapitalizationType:UITextAutocapitalizationTypeNone];
         [traits setAutocorrectionType:UITextAutocorrectionTypeNo];
         [traits setKeyboardType:UIKeyboardTypeASCIICapable];