Merge branch 'master' of saurik.com:cydia

[cydia.git] / UICaboodle / BrowserView.h

diff --git a/UICaboodle/BrowserView.h b/UICaboodle/BrowserView.h
index ec779c94ab6ee8c9cf6aab42d1dd5daf1f1e06ee..c61fef41a4f8789216c5d9733dc19a4355f0e123 100644 (file)
--- a/UICaboodle/BrowserView.h
+++ b/UICaboodle/BrowserView.h
@@ -1,22 +1,12 @@
-#import "ResetView.h"
+#import <UICaboodle/RVPage.h>
+#import <UICaboodle/RVBook.h>

 
 

-#include <WebKit/DOMCSSPrimitiveValue.h>
-#include <WebKit/DOMCSSStyleDeclaration.h>
-#include <WebKit/DOMDocument.h>
-#include <WebKit/DOMHTMLBodyElement.h>
-#include <WebKit/DOMNodeList.h>
-#include <WebKit/DOMRGBColor.h>
+#import <UIKit/UIKit.h>

 
 

+#include <WebKit/DOMNodeList.h>

 #include <WebKit/WebFrame.h>
 #include <WebKit/WebFrame.h>

-#include <WebKit/WebPolicyDelegate.h>
-#include <WebKit/WebPreferences.h>

 #include <WebKit/WebScriptObject.h>
 #include <WebKit/WebScriptObject.h>

-
-#import <WebKit/WebView.h>
-#import <WebKit/WebView-WebPrivate.h>
-
-#include <WebCore/Page.h>
-#include <WebCore/Settings.h>
+#include <WebKit/WebView.h>

 
 #import <JavaScriptCore/JavaScriptCore.h>
 
 
 #import <JavaScriptCore/JavaScriptCore.h>
 


@@ -35,15 +25,17 @@
 @class IndirectDelegate;
 
 @interface WebScriptObject (UICaboodle)
 @class IndirectDelegate;
 
 @interface WebScriptObject (UICaboodle)

-- (unsigned) count;
+- (NSUInteger) count;

 - (id) objectAtIndex:(unsigned)index;
 @end
 
 @protocol BrowserControllerDelegate
 - (id) objectAtIndex:(unsigned)index;
 @end
 
 @protocol BrowserControllerDelegate

-- (UCViewController *) pageForURL:(NSURL *)url hasTag:(int *)tag;
+- (CYViewController *) pageForURL:(NSURL *)url hasTag:(int *)tag;

 @end
 
 @end
 

-@interface BrowserController : UCViewController {
+@interface BrowserController : CYViewController <
+    HookProtocol
+> {

     UIScroller *scroller_;
     UIWebDocumentView *document_;
     UIProgressIndicator *indicator_;
     UIScroller *scroller_;
     UIWebDocumentView *document_;
     UIProgressIndicator *indicator_;


@@ -76,7 +68,7 @@
     bool editing_;
 
     Class class_;
     bool editing_;
 
     Class class_;

-    
+

     id reloaditem_;
     id loadingitem_;
 }
     id reloaditem_;
     id loadingitem_;
 }


@@ -118,4 +110,11 @@
 - (bool) promptForSensitive:(NSString *)name;
 - (bool) allowSensitiveRequests;
 
 - (bool) promptForSensitive:(NSString *)name;
 - (bool) allowSensitiveRequests;
 

-@end
\ No newline at end of file
+- (void) alertView:(UIAlertView *)alert clickedButtonAtIndex:(NSInteger)button;
+- (void) customButtonClicked;
+- (void) applyRightButton;
+
+- (void) _startLoading;
+- (void) close;
+
+@end