summaryrefslogtreecommitdiff
path: root/Cydia.mm
diff options
context:
space:
mode:
authorJay Freeman (saurik) <saurik@saurik.com>2010-10-06 19:27:29 -0700
committerJay Freeman (saurik) <saurik@saurik.com>2010-10-06 19:27:29 -0700
commit9b623dac3e39ca96e0326a7e93d9684b224c1fa1 (patch)
tree0cb2a5848b0173f705c9e15c9f0cc3763d3c9f6f /Cydia.mm
parent9373b14a9943e2bf10ac68d1314bdb2d0ae8ee43 (diff)
Merge CYViewController into UCViewController.
Diffstat (limited to 'Cydia.mm')
-rw-r--r--Cydia.mm23
1 files changed, 8 insertions, 15 deletions
diff --git a/Cydia.mm b/Cydia.mm
index c8e2c1b..97f84c8 100644
--- a/Cydia.mm
+++ b/Cydia.mm
@@ -1215,7 +1215,7 @@ bool isSectionVisible(NSString *section) {
- (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
@@ -3864,13 +3864,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
@end
/* }}} */
-/* Cydia View Controller {{{ */
-@interface CYViewController : UCViewController { }
-@end
-
-@implementation CYViewController
-@end
-/* }}} */
/* Cydia Browser Controller {{{ */
@interface CYBrowserController : BrowserController {
CydiaObject *cydia_;
@@ -7880,8 +7873,8 @@ typedef enum {
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
@@ -8204,7 +8197,7 @@ static _finline void _setHomePage(Cydia *self) {
[self complete];
}
-- (void) setPage:(UCViewController *)page {
+- (void) setPage:(CYViewController *)page {
[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;
@@ -8443,7 +8436,7 @@ static _finline void _setHomePage(Cydia *self) {
[window_ setUserInteractionEnabled:YES];
}
-- (UCViewController *) pageForPackage:(NSString *)name {
+- (CYViewController *) pageForPackage:(NSString *)name {
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;
@@ -8507,7 +8500,7 @@ static _finline void _setHomePage(Cydia *self) {
- (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_])];