Merge CYViewController into UCViewController.

diff --git a/Cydia.mm b/Cydia.mm
index c8e2c1bc239f71050aa0acbf55cf11c2951ccfd9..97f84c8fb01537d1f0d60389511b5d2230f6b608 100644 (file)
--- a/Cydia.mm
+++ b/Cydia.mm
@@ -1215,7 +1215,7 @@ bool isSectionVisible(NSString *section) {
 - (void) showSettings;
 - (UIProgressHUD *) addProgressHUD;
 - (void) removeProgressHUD:(UIProgressHUD *)hud;
 - (void) showSettings;
 - (UIProgressHUD *) addProgressHUD;
 - (void) removeProgressHUD:(UIProgressHUD *)hud;

-- (UCViewController *) pageForPackage:(NSString *)name;
+- (CYViewController *) pageForPackage:(NSString *)name;

 - (PackageController *) packageController;
 - (void) showActionSheet:(UIActionSheet *)sheet fromItem:(UIBarButtonItem *)item;
 @end
 - (PackageController *) packageController;
 - (void) showActionSheet:(UIActionSheet *)sheet fromItem:(UIBarButtonItem *)item;
 @end


@@ -3864,13 +3864,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 @end
 /* }}} */
 
 @end
 /* }}} */
 

-/* Cydia View Controller {{{ */
-@interface CYViewController : UCViewController { }
-@end
-
-@implementation CYViewController
-@end
-/* }}} */

 /* Cydia Browser Controller {{{ */
 @interface CYBrowserController : BrowserController {
     CydiaObject *cydia_;
 /* Cydia Browser Controller {{{ */
 @interface CYBrowserController : BrowserController {
     CydiaObject *cydia_;


@@ -7880,8 +7873,8 @@ typedef enum {
     bool loaded_;
 }
 
     bool loaded_;
 }
 

-- (UCViewController *) _pageForURL:(NSURL *)url withClass:(Class)_class;
-- (void) setPage:(UCViewController *)page;
+- (CYViewController *) _pageForURL:(NSURL *)url withClass:(Class)_class;
+- (void) setPage:(CYViewController *)page;

 - (void) loadData;
 
 @end
 - (void) loadData;
 
 @end


@@ -8204,7 +8197,7 @@ static _finline void _setHomePage(Cydia *self) {
     [self complete];
 }
 
     [self complete];
 }
 

-- (void) setPage:(UCViewController *)page {
+- (void) setPage:(CYViewController *)page {

     [page setDelegate:self];
 
     CYNavigationController *navController = (CYNavigationController *) [tabbar_ selectedViewController];
     [page setDelegate:self];
 
     CYNavigationController *navController = (CYNavigationController *) [tabbar_ selectedViewController];


@@ -8214,7 +8207,7 @@ static _finline void _setHomePage(Cydia *self) {
     }
 }
 
     }
 }
 

-- (UCViewController *) _pageForURL:(NSURL *)url withClass:(Class)_class {
+- (CYViewController *) _pageForURL:(NSURL *)url withClass:(Class)_class {

     CYBrowserController *browser = [[[_class alloc] init] autorelease];
     [browser loadURL:url];
     return browser;
     CYBrowserController *browser = [[[_class alloc] init] autorelease];
     [browser loadURL:url];
     return browser;


@@ -8443,7 +8436,7 @@ static _finline void _setHomePage(Cydia *self) {
     [window_ setUserInteractionEnabled:YES];
 }
 
     [window_ setUserInteractionEnabled:YES];
 }
 

-- (UCViewController *) pageForPackage:(NSString *)name {
+- (CYViewController *) pageForPackage:(NSString *)name {

     if (Package *package = [database_ packageWithName:name]) {
         PackageController *view([self packageController]);
         [view setPackage:package];
     if (Package *package = [database_ packageWithName:name]) {
         PackageController *view([self packageController]);
         [view setPackage:package];


@@ -8455,7 +8448,7 @@ static _finline void _setHomePage(Cydia *self) {
     }
 }
 
     }
 }
 

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

     if (tag != NULL)
         *tag = -1;
 
     if (tag != NULL)
         *tag = -1;
 


@@ -8507,7 +8500,7 @@ static _finline void _setHomePage(Cydia *self) {
 - (void) applicationOpenURL:(NSURL *)url {
     [super applicationOpenURL:url];
     int tag;
 - (void) applicationOpenURL:(NSURL *)url {
     [super applicationOpenURL:url];
     int tag;

-    if (UCViewController *page = [self pageForURL:url hasTag:&tag]) {
+    if (CYViewController *page = [self pageForURL:url hasTag:&tag]) {

         [self setPage:page];
         tag_ = tag;
         [tabbar_ setSelectedViewController:(tag_ == -1 ? nil : [[tabbar_ viewControllers] objectAtIndex:tag_])];
         [self setPage:page];
         tag_ = tag;
         [tabbar_ setSelectedViewController:(tag_ == -1 ? nil : [[tabbar_ viewControllers] objectAtIndex:tag_])];

diff --git a/UICaboodle/BrowserView.h b/UICaboodle/BrowserView.h
index 23be6317a91438c7400f275efe1977abd26bb02b..3f759cada1e643fadd6a0b2d5a7793881e2d4232 100644 (file)
--- a/UICaboodle/BrowserView.h
+++ b/UICaboodle/BrowserView.h
@@ -27,10 +27,10 @@
 @end
 
 @protocol BrowserControllerDelegate
 @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_;
     HookProtocol
 > {
     UIScroller *scroller_;

diff --git a/UICaboodle/BrowserView.mm b/UICaboodle/BrowserView.mm
index 50c31e45d9fd2f194ef06479e7864525db001c4a..793678ef80e264357b35adaa12e2ecb961e304a7 100644 (file)
--- a/UICaboodle/BrowserView.mm
+++ b/UICaboodle/BrowserView.mm
@@ -413,7 +413,7 @@ static Class $UIWebBrowserView;
     [self view:sender didSetFrame:frame];
 }
 
     [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];
     [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];
 }
 
     [[self navigationController] pushViewController:self animated:YES];
 }
 

-- (void) swapPage:(UCViewController *)page {
+- (void) swapPage:(CYViewController *)page {

     [page setDelegate:delegate_];
     if (pushed_) [[self navigationController] popViewControllerAnimated:NO];
 
     [page setDelegate:delegate_];
     if (pushed_) [[self navigationController] popViewControllerAnimated:NO];
 


@@ -439,7 +439,7 @@ static Class $UIWebBrowserView;
     NSLog(@"getSpecial:%@", url);
 #endif
 
     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
         if (swap)
             [self swapPage:page];
         else


@@ -662,7 +662,7 @@ static Class $UIWebBrowserView;
                 UCNavigationController *navigation([[[UCNavigationController alloc] init] autorelease]);
                 [navigation setHook:indirect_];
 
                 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? */
 
                 if (page == nil) {
                     /* XXX: call createWebViewWithRequest instead? */
 

diff --git a/UICaboodle/RVPage.h b/UICaboodle/RVPage.h
index 3f16bc1507c9353bf4d48014fa866633f8943699..1f39428a8d5a6ded7d3502036a788653c9ef1392 100644 (file)
--- a/UICaboodle/RVPage.h
+++ b/UICaboodle/RVPage.h
@@ -2,7 +2,7 @@
 
 #import <UIKit/UIKit.h>
 
 
 #import <UIKit/UIKit.h>
 

-@interface UCViewController : UIViewController {
+@interface CYViewController : UIViewController {

     id delegate_;
 }
 - (void)setDelegate:(id)delegate;
     id delegate_;
 }
 - (void)setDelegate:(id)delegate;

diff --git a/UICaboodle/RVPage.mm b/UICaboodle/RVPage.mm
index b22533304f22c0cdaf4c1c5f9383a5e792830a90..8c702d30fcbf5df864236b0ec1ee036c9cbe6033 100644 (file)
--- a/UICaboodle/RVPage.mm
+++ b/UICaboodle/RVPage.mm
@@ -5,7 +5,7 @@
 
 #import "RVBook.h"
 
 
 #import "RVBook.h"
 

-@implementation UCViewController
+@implementation CYViewController

 - (void)setDelegate:(id)delegate {
     delegate_ = delegate;
 }
 - (void)setDelegate:(id)delegate {
     delegate_ = delegate;
 }