From 1ee69bb47f1218e051a8ef9b05c1170cf46e1a9d Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Tue, 1 Mar 2011 08:39:34 -0800 Subject: [PATCH] Rename CYWebView to CyteWebView. --- CyteKit/CyteWebView.h | 6 ++--- CyteKit/CyteWebView.mm | 38 ++++++++++++++++---------------- CyteKit/CyteWebViewController.h | 4 ++-- CyteKit/CyteWebViewController.mm | 4 ++-- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/CyteKit/CyteWebView.h b/CyteKit/CyteWebView.h index 09c66da2..91878b7e 100644 --- a/CyteKit/CyteWebView.h +++ b/CyteKit/CyteWebView.h @@ -50,7 +50,7 @@ #include -@protocol CYWebViewDelegate +@protocol CyteWebViewDelegate - (void) webView:(WebView *)view addMessageToConsole:(NSDictionary *)message; - (void) webView:(WebView *)view decidePolicyForNavigationAction:(NSDictionary *)action request:(NSURLRequest *)request frame:(WebFrame *)frame decisionListener:(id)listener; - (void) webView:(WebView *)view decidePolicyForNewWindowAction:(NSDictionary *)action request:(NSURLRequest *)request newFrameName:(NSString *)name decisionListener:(id)listener; @@ -68,10 +68,10 @@ - (void) webViewUpdateViewSettings:(UIWebView *)view; @end -@interface CYWebView : UIWebView { +@interface CyteWebView : UIWebView { } -- (id) delegate; +- (id) delegate; - (void) dispatchEvent:(NSString *)event; - (void) reloadFromOrigin; diff --git a/CyteKit/CyteWebView.mm b/CyteKit/CyteWebView.mm index c7044bc3..03a32540 100644 --- a/CyteKit/CyteWebView.mm +++ b/CyteKit/CyteWebView.mm @@ -113,7 +113,7 @@ enum CYWebPolicyDecision { @end // }}} -@implementation CYWebView : UIWebView +@implementation CyteWebView : UIWebView #if ShowInternals #include "CyteKit/UCInternal.h" @@ -128,12 +128,12 @@ enum CYWebPolicyDecision { [super dealloc]; } -- (id) delegate { - return (id) [super delegate]; +- (id) delegate { + return (id) [super delegate]; } /*- (WebView *) webView:(WebView *)view createWebViewWithRequest:(NSURLRequest *)request { - id delegate([self delegate]); + id delegate([self delegate]); WebView *created(nil); if (created == nil && [delegate respondsToSelector:@selector(webView:createWebViewWithRequest:)]) created = [delegate webView:view createWebViewWithRequest:request]; @@ -150,7 +150,7 @@ static void $UIWebViewWebViewDelegate$webView$addMessageToConsole$(UIWebViewWebV } - (void) webView:(WebView *)view addMessageToConsole:(NSDictionary *)message { - id delegate([self delegate]); + id delegate([self delegate]); if ([delegate respondsToSelector:@selector(webView:addMessageToConsole:)]) [delegate webView:view addMessageToConsole:message]; if ([UIWebView instancesRespondToSelector:@selector(webView:addMessageToConsole:)]) @@ -159,7 +159,7 @@ static void $UIWebViewWebViewDelegate$webView$addMessageToConsole$(UIWebViewWebV // }}} // webView:decidePolicyForNavigationAction:request:frame:decisionListener: (2.0+) {{{ - (void) webView:(WebView *)view decidePolicyForNavigationAction:(NSDictionary *)action request:(NSURLRequest *)request frame:(WebFrame *)frame decisionListener:(id)listener { - id delegate([self delegate]); + id delegate([self delegate]); CYWebPolicyDecisionMediator *mediator([[[CYWebPolicyDecisionMediator alloc] initWithListener:listener] autorelease]); if (![mediator decided] && [delegate respondsToSelector:@selector(webView:decidePolicyForNavigationAction:request:frame:decisionListener:)]) [delegate webView:view decidePolicyForNavigationAction:action request:request frame:frame decisionListener:mediator]; @@ -176,7 +176,7 @@ static void $UIWebViewWebViewDelegate$webView$decidePolicyForNewWindowAction$req } - (void) webView:(WebView *)view decidePolicyForNewWindowAction:(NSDictionary *)action request:(NSURLRequest *)request newFrameName:(NSString *)frame decisionListener:(id)listener { - id delegate([self delegate]); + id delegate([self delegate]); CYWebPolicyDecisionMediator *mediator([[[CYWebPolicyDecisionMediator alloc] initWithListener:listener] autorelease]); if (![mediator decided] && [delegate respondsToSelector:@selector(webView:decidePolicyForNewWindowAction:request:newFrameName:decisionListener:)]) [delegate webView:view decidePolicyForNewWindowAction:action request:request newFrameName:frame decisionListener:mediator]; @@ -193,7 +193,7 @@ static void $UIWebViewWebViewDelegate$webView$didClearWindowObject$forFrame$(UIW } - (void) webView:(WebView *)view didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame { - id delegate([self delegate]); + id delegate([self delegate]); if ([delegate respondsToSelector:@selector(webView:didClearWindowObject:forFrame:)]) [delegate webView:view didClearWindowObject:window forFrame:frame]; if ([UIWebView instancesRespondToSelector:@selector(webView:didClearWindowObject:forFrame:)]) @@ -202,7 +202,7 @@ static void $UIWebViewWebViewDelegate$webView$didClearWindowObject$forFrame$(UIW // }}} // webView:didFailLoadWithError:forFrame: (2.0+) {{{ - (void) webView:(WebView *)view didFailLoadWithError:(NSError *)error forFrame:(WebFrame *)frame { - id delegate([self delegate]); + id delegate([self delegate]); if ([delegate respondsToSelector:@selector(webView:didFailLoadWithError:forFrame:)]) [delegate webView:view didFailLoadWithError:error forFrame:frame]; if ([UIWebView instancesRespondToSelector:@selector(webView:didFailLoadWithError:forFrame:)]) @@ -211,7 +211,7 @@ static void $UIWebViewWebViewDelegate$webView$didClearWindowObject$forFrame$(UIW // }}} // webView:didFailProvisionalLoadWithError:forFrame: (2.0+) {{{ - (void) webView:(WebView *)view didFailProvisionalLoadWithError:(NSError *)error forFrame:(WebFrame *)frame { - id delegate([self delegate]); + id delegate([self delegate]); if ([delegate respondsToSelector:@selector(webView:didFailProvisionalLoadWithError:forFrame:)]) [delegate webView:view didFailProvisionalLoadWithError:error forFrame:frame]; if ([UIWebView instancesRespondToSelector:@selector(webView:didFailProvisionalLoadWithError:forFrame:)]) @@ -220,7 +220,7 @@ static void $UIWebViewWebViewDelegate$webView$didClearWindowObject$forFrame$(UIW // }}} // webView:didFinishLoadForFrame: (2.0+) {{{ - (void) webView:(WebView *)view didFinishLoadForFrame:(WebFrame *)frame { - id delegate([self delegate]); + id delegate([self delegate]); if ([delegate respondsToSelector:@selector(webView:didFinishLoadForFrame:)]) [delegate webView:view didFinishLoadForFrame:frame]; if ([UIWebView instancesRespondToSelector:@selector(webView:didFinishLoadForFrame:)]) @@ -235,7 +235,7 @@ static void $UIWebViewWebViewDelegate$webView$didReceiveTitle$forFrame$(UIWebVie } - (void) webView:(WebView *)view didReceiveTitle:(NSString *)title forFrame:(WebFrame *)frame { - id delegate([self delegate]); + id delegate([self delegate]); if ([delegate respondsToSelector:@selector(webView:didReceiveTitle:forFrame:)]) [delegate webView:view didReceiveTitle:title forFrame:frame]; if ([UIWebView instancesRespondToSelector:@selector(webView:didReceiveTitle:forFrame:)]) @@ -244,7 +244,7 @@ static void $UIWebViewWebViewDelegate$webView$didReceiveTitle$forFrame$(UIWebVie // }}} // webView:didStartProvisionalLoadForFrame: (2.0+) {{{ - (void) webView:(WebView *)view didStartProvisionalLoadForFrame:(WebFrame *)frame { - id delegate([self delegate]); + id delegate([self delegate]); if ([delegate respondsToSelector:@selector(webView:didStartProvisionalLoadForFrame:)]) [delegate webView:view didStartProvisionalLoadForFrame:frame]; if ([UIWebView instancesRespondToSelector:@selector(webView:didStartProvisionalLoadForFrame:)]) @@ -260,7 +260,7 @@ static NSURLRequest *$UIWebViewWebViewDelegate$webView$resource$willSendRequest$ } - (NSURLRequest *) webView:(WebView *)view resource:(id)identifier willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)response fromDataSource:(WebDataSource *)source { - id delegate([self delegate]); + id delegate([self delegate]); if ([UIWebView instancesRespondToSelector:@selector(webView:resource:willSendRequest:redirectResponse:fromDataSource:)]) request = [super webView:view resource:identifier willSendRequest:request redirectResponse:response fromDataSource:source]; if ([delegate respondsToSelector:@selector(webView:resource:willSendRequest:redirectResponse:fromDataSource:)]) @@ -270,7 +270,7 @@ static NSURLRequest *$UIWebViewWebViewDelegate$webView$resource$willSendRequest$ // }}} // webView:runJavaScriptAlertPanelWithMessage:initiatedByFrame: (2.1+) {{{ - (void) webView:(WebView *)view runJavaScriptAlertPanelWithMessage:(NSString *)message initiatedByFrame:(WebFrame *)frame { - id delegate([self delegate]); + id delegate([self delegate]); if ([UIWebView instancesRespondToSelector:@selector(webView:runJavaScriptAlertPanelWithMessage:initiatedByFrame:)]) if ( ![delegate respondsToSelector:@selector(webView:shouldRunJavaScriptAlertPanelWithMessage:initiatedByFrame:)] || @@ -281,7 +281,7 @@ static NSURLRequest *$UIWebViewWebViewDelegate$webView$resource$willSendRequest$ // }}} // webView:runJavaScriptConfirmPanelWithMessage:initiatedByFrame: (2.1+) {{{ - (BOOL) webView:(WebView *)view runJavaScriptConfirmPanelWithMessage:(NSString *)message initiatedByFrame:(WebFrame *)frame { - id delegate([self delegate]); + id delegate([self delegate]); if ([UIWebView instancesRespondToSelector:@selector(webView:runJavaScriptConfirmPanelWithMessage:initiatedByFrame:)]) if ( ![delegate respondsToSelector:@selector(webView:shouldRunJavaScriptConfirmPanelWithMessage:initiatedByFrame:)] || @@ -293,7 +293,7 @@ static NSURLRequest *$UIWebViewWebViewDelegate$webView$resource$willSendRequest$ // }}} // webView:runJavaScriptTextInputPanelWithPrompt:defaultText:initiatedByFrame: (2.1+) {{{ - (NSString *) webView:(WebView *)view runJavaScriptTextInputPanelWithPrompt:(NSString *)prompt defaultText:(NSString *)text initiatedByFrame:(WebFrame *)frame { - id delegate([self delegate]); + id delegate([self delegate]); if ([UIWebView instancesRespondToSelector:@selector(webView:runJavaScriptTextInputPanelWithPrompt:defaultText:initiatedByFrame:)]) if ( ![delegate respondsToSelector:@selector(webView:shouldRunJavaScriptTextInputPanelWithPrompt:defaultText:initiatedByFrame:)] || @@ -311,7 +311,7 @@ static void $UIWebViewWebViewDelegate$webViewClose$(UIWebViewWebViewDelegate *se } - (void) webViewClose:(WebView *)view { - id delegate([self delegate]); + id delegate([self delegate]); if ([delegate respondsToSelector:@selector(webViewClose:)]) [delegate webViewClose:view]; if ([UIWebView instancesRespondToSelector:@selector(webViewClose:)]) @@ -322,7 +322,7 @@ static void $UIWebViewWebViewDelegate$webViewClose$(UIWebViewWebViewDelegate *se - (void) _updateViewSettings { [super _updateViewSettings]; - id delegate([self delegate]); + id delegate([self delegate]); if ([delegate respondsToSelector:@selector(webViewUpdateViewSettings:)]) [delegate webViewUpdateViewSettings:self]; } diff --git a/CyteKit/CyteWebViewController.h b/CyteKit/CyteWebViewController.h index 05024e34..30b551a5 100644 --- a/CyteKit/CyteWebViewController.h +++ b/CyteKit/CyteWebViewController.h @@ -57,10 +57,10 @@ @end @interface BrowserController : CYViewController < - CYWebViewDelegate, + CyteWebViewDelegate, UIWebViewDelegate > { - _transient CYWebView *webview_; + _transient CyteWebView *webview_; _transient UIScrollView *scroller_; UIActivityIndicatorView *indicator_; diff --git a/CyteKit/CyteWebViewController.mm b/CyteKit/CyteWebViewController.mm index 5c7ceafb..d1f610cf 100644 --- a/CyteKit/CyteWebViewController.mm +++ b/CyteKit/CyteWebViewController.mm @@ -364,7 +364,7 @@ float CYScrollViewDecelerationRateNormal; } } -// CYWebViewDelegate {{{ +// CyteWebViewDelegate {{{ - (void) webView:(WebView *)view addMessageToConsole:(NSDictionary *)message { #if LogMessages static Pcre irritating("^(?:The page at .* displayed insecure content from .*\\.|Unsafe JavaScript attempt to access frame with URL .* from frame with URL .*\\. Domains, protocols and ports must match\\.)\\n$"); @@ -679,7 +679,7 @@ float CYScrollViewDecelerationRateNormal; CGRect bounds([[self view] bounds]); - webview_ = [[[CYWebView alloc] initWithFrame:bounds] autorelease]; + webview_ = [[[CyteWebView alloc] initWithFrame:bounds] autorelease]; [webview_ setDelegate:self]; [self setView:webview_]; -- 2.45.2