From 9b623dac3e39ca96e0326a7e93d9684b224c1fa1 Mon Sep 17 00:00:00 2001
From: "Jay Freeman (saurik)" <saurik@saurik.com>
Date: Wed, 6 Oct 2010 19:27:29 -0700
Subject: Merge CYViewController into UCViewController.

---
 UICaboodle/BrowserView.h  | 4 ++--
 UICaboodle/BrowserView.mm | 8 ++++----
 UICaboodle/RVPage.h       | 2 +-
 UICaboodle/RVPage.mm      | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'UICaboodle')

diff --git a/UICaboodle/BrowserView.h b/UICaboodle/BrowserView.h
index 23be631..3f759ca 100644
--- a/UICaboodle/BrowserView.h
+++ b/UICaboodle/BrowserView.h
@@ -27,10 +27,10 @@
 @end
 
 @protocol BrowserControllerDelegate
-- (UCViewController *) pageForURL:(NSURL *)url hasTag:(int *)tag;
+- (CYViewController *) pageForURL:(NSURL *)url hasTag:(int *)tag;
 @end
 
-@interface BrowserController : UCViewController <
+@interface BrowserController : CYViewController <
     HookProtocol
 > {
     UIScroller *scroller_;
diff --git a/UICaboodle/BrowserView.mm b/UICaboodle/BrowserView.mm
index 50c31e4..793678e 100644
--- a/UICaboodle/BrowserView.mm
+++ b/UICaboodle/BrowserView.mm
@@ -413,7 +413,7 @@ static Class $UIWebBrowserView;
     [self view:sender didSetFrame:frame];
 }
 
-- (void) pushPage:(UCViewController *)page {
+- (void) pushPage:(CYViewController *)page {
     [page setDelegate:delegate_];
     [[self navigationItem] setTitle:title_];
     [[self navigationController] pushViewController:page animated:YES];
@@ -427,7 +427,7 @@ static Class $UIWebBrowserView;
     [[self navigationController] pushViewController:self animated:YES];
 }
 
-- (void) swapPage:(UCViewController *)page {
+- (void) swapPage:(CYViewController *)page {
     [page setDelegate:delegate_];
     if (pushed_) [[self navigationController] popViewControllerAnimated:NO];
 
@@ -439,7 +439,7 @@ static Class $UIWebBrowserView;
     NSLog(@"getSpecial:%@", url);
 #endif
 
-    if (UCViewController *page = [delegate_ pageForURL:url hasTag:NULL]) {
+    if (CYViewController *page = [delegate_ pageForURL:url hasTag:NULL]) {
         if (swap)
             [self swapPage:page];
         else
@@ -662,7 +662,7 @@ static Class $UIWebBrowserView;
                 UCNavigationController *navigation([[[UCNavigationController alloc] init] autorelease]);
                 [navigation setHook:indirect_];
 
-                UCViewController *page([delegate_ pageForURL:url hasTag:NULL]);
+                CYViewController *page([delegate_ pageForURL:url hasTag:NULL]);
                 if (page == nil) {
                     /* XXX: call createWebViewWithRequest instead? */
 
diff --git a/UICaboodle/RVPage.h b/UICaboodle/RVPage.h
index 3f16bc1..1f39428 100644
--- a/UICaboodle/RVPage.h
+++ b/UICaboodle/RVPage.h
@@ -2,7 +2,7 @@
 
 #import <UIKit/UIKit.h>
 
-@interface UCViewController : UIViewController {
+@interface CYViewController : UIViewController {
     id delegate_;
 }
 - (void)setDelegate:(id)delegate;
diff --git a/UICaboodle/RVPage.mm b/UICaboodle/RVPage.mm
index b225333..8c702d3 100644
--- a/UICaboodle/RVPage.mm
+++ b/UICaboodle/RVPage.mm
@@ -5,7 +5,7 @@
 
 #import "RVBook.h"
 
-@implementation UCViewController
+@implementation CYViewController
 - (void)setDelegate:(id)delegate {
     delegate_ = delegate;
 }
-- 
cgit v1.2.3