From bc11cf5bb67e9f5c4096dc93d813272a49de1115 Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Mon, 4 Oct 2010 03:37:09 -0700 Subject: Removed tabs and trailing space characters from codebase. --- UICaboodle/BrowserView.h | 2 +- UICaboodle/BrowserView.mm | 116 +++++++++++++++++++++++----------------------- UICaboodle/RVBook.h | 2 +- UICaboodle/RVBook.mm | 8 ++-- UICaboodle/RVPage.h | 2 +- UICaboodle/RVPage.mm | 4 +- UICaboodle/UCString.h | 2 +- 7 files changed, 68 insertions(+), 68 deletions(-) (limited to 'UICaboodle') diff --git a/UICaboodle/BrowserView.h b/UICaboodle/BrowserView.h index 2f77f84..f2b0db8 100644 --- a/UICaboodle/BrowserView.h +++ b/UICaboodle/BrowserView.h @@ -65,7 +65,7 @@ bool editing_; Class class_; - + id reloaditem_; id loadingitem_; } diff --git a/UICaboodle/BrowserView.mm b/UICaboodle/BrowserView.mm index 8dd2afa..ee8563f 100644 --- a/UICaboodle/BrowserView.mm +++ b/UICaboodle/BrowserView.mm @@ -310,7 +310,7 @@ static Class $UIWebBrowserView; [reloaditem_ release]; if (loadingitem_ != nil) [loadingitem_ release]; - + [super dealloc]; } @@ -364,7 +364,7 @@ static Class $UIWebBrowserView; /* XXX: WebThreadLock? */ - (void) _fixScroller:(CGRect)bounds { - float extra; + float extra; if (!editing_ || $UIFormAssistant == nil) extra = 0; @@ -430,8 +430,8 @@ static Class $UIWebBrowserView; - (void) swapPage:(UCViewController *)page { [page setDelegate:delegate_]; if (pushed_) [[self navigationController] popViewControllerAnimated:NO]; - - [[self navigationController] pushViewController:page animated:NO]; + + [[self navigationController] pushViewController:page animated:NO]; } - (BOOL) getSpecial:(NSURL *)url swap:(BOOL)swap { @@ -576,7 +576,7 @@ static Class $UIWebBrowserView; [function_ autorelease]; function_ = function == nil ? nil : [function retain]; - [self applyRightButton]; + [self applyRightButton]; } - (void) setButtonTitle:(NSString *)button withStyle:(NSString *)style toFunction:(id)function { @@ -592,7 +592,7 @@ static Class $UIWebBrowserView; [function_ autorelease]; function_ = function == nil ? nil : [function retain]; - [self applyRightButton]; + [self applyRightButton]; } - (void) setFinishHook:(id)function { @@ -625,7 +625,7 @@ static Class $UIWebBrowserView; } - (void) webViewClose:(WebView *)sender { - [self close]; + [self close]; } - (void) close { @@ -675,15 +675,15 @@ static Class $UIWebBrowserView; [page setDelegate:delegate_]; [navigation setViewControllers:[NSArray arrayWithObject:page]]; - UIBarButtonItem *closeItem = [[UIBarButtonItem alloc] - initWithTitle:UCLocalize("CLOSE") - style:UIBarButtonItemStylePlain - target:page - action:@selector(close) - ]; - [[page navigationItem] setLeftBarButtonItem:closeItem]; - [closeItem release]; - + UIBarButtonItem *closeItem = [[UIBarButtonItem alloc] + initWithTitle:UCLocalize("CLOSE") + style:UIBarButtonItemStylePlain + target:page + action:@selector(close) + ]; + [[page navigationItem] setLeftBarButtonItem:closeItem]; + [closeItem release]; + [[self navigationController] presentModalViewController:navigation animated:YES]; } } else goto unknown; @@ -944,15 +944,15 @@ static Class $UIWebBrowserView; [browser loadRequest:request]; [navigation setViewControllers:[NSArray arrayWithObject:browser]]; - UIBarButtonItem *closeItem = [[UIBarButtonItem alloc] - initWithTitle:UCLocalize("CLOSE") - style:UIBarButtonItemStylePlain - target:browser - action:@selector(close) - ]; - [[browser navigationItem] setLeftBarButtonItem:closeItem]; - [closeItem release]; - + UIBarButtonItem *closeItem = [[UIBarButtonItem alloc] + initWithTitle:UCLocalize("CLOSE") + style:UIBarButtonItemStylePlain + target:browser + action:@selector(close) + ]; + [[browser navigationItem] setLeftBarButtonItem:closeItem]; + [closeItem release]; + [[self navigationController] presentModalViewController:navigation animated:YES]; } /*else if (request == nil) { [[self navigationItem] setTitle:title_]; @@ -1051,7 +1051,7 @@ static Class $UIWebBrowserView; } } - [self _startLoading]; + [self _startLoading]; } - (UIBarButtonItemStyle) rightButtonStyle { @@ -1066,12 +1066,12 @@ static Class $UIWebBrowserView; - (UIBarButtonItem *) customButton { UIBarButtonItem *customItem = [[UIBarButtonItem alloc] - initWithTitle:button_ - style:[self rightButtonStyle] - target:self - action:@selector(customButtonClicked) - ]; - + initWithTitle:button_ + style:[self rightButtonStyle] + target:self + action:@selector(customButtonClicked) + ]; + return [customItem autorelease]; } @@ -1080,15 +1080,15 @@ static Class $UIWebBrowserView; } - (void) applyRightButton { - if ([self isLoading]) { - [[self navigationItem] setRightBarButtonItem:loadingitem_ animated:YES]; - [[loadingitem_ view] addSubview:indicator_]; + if ([self isLoading]) { + [[self navigationItem] setRightBarButtonItem:loadingitem_ animated:YES]; + [[loadingitem_ view] addSubview:indicator_]; [self applyLoadingTitle]; } else if (button_) { [[self navigationItem] setRightBarButtonItem:[self customButton] animated:YES]; } else { [[self navigationItem] setRightBarButtonItem:reloaditem_ animated:YES]; - } + } } - (void) _startLoading { @@ -1104,8 +1104,8 @@ static Class $UIWebBrowserView; if (finish_ != nil) [self callFunction:finish_]; - [self applyRightButton]; - if (![self isLoading]) [[self navigationItem] setTitle:title_]; + [self applyRightButton]; + if (![self isLoading]) [[self navigationItem] setTitle:title_]; } - (bool) isLoading { @@ -1344,7 +1344,7 @@ static Class $UIWebBrowserView; BrowserView *actualView = [[BrowserView alloc] initWithFrame:CGRectZero]; [self setView:actualView]; - + struct CGRect bounds = [[self view] bounds]; scroller_ = [[objc_getClass(Wildcat_ ? "UIScrollView" : "UIScroller") alloc] initWithFrame:bounds]; @@ -1464,7 +1464,7 @@ static Class $UIWebBrowserView; else [preferences _setLayoutInterval:0]; } - + actualView.documentView = document_; [actualView release]; @@ -1497,22 +1497,22 @@ static Class $UIWebBrowserView; CGSize indsize = [UIProgressIndicator defaultSizeForStyle:UIProgressIndicatorStyleMediumWhite]; indicator_ = [[UIProgressIndicator alloc] initWithFrame:CGRectMake(15, 5, indsize.width, indsize.height)]; [indicator_ setStyle:UIProgressIndicatorStyleMediumWhite]; - [indicator_ startAnimation]; - - reloaditem_ = [[UIBarButtonItem alloc] - initWithTitle:UCLocalize("RELOAD") - style:[self rightButtonStyle] - target:self - action:@selector(reloadButtonClicked) - ]; - - loadingitem_ = [[UIBarButtonItem alloc] - initWithTitle:@" " - style:UIBarButtonItemStylePlain - target:self - action:@selector(reloadButtonClicked) - ]; - [[loadingitem_ view] addSubview:indicator_]; + [indicator_ startAnimation]; + + reloaditem_ = [[UIBarButtonItem alloc] + initWithTitle:UCLocalize("RELOAD") + style:[self rightButtonStyle] + target:self + action:@selector(reloadButtonClicked) + ]; + + loadingitem_ = [[UIBarButtonItem alloc] + initWithTitle:@" " + style:UIBarButtonItemStylePlain + target:self + action:@selector(reloadButtonClicked) + ]; + [[loadingitem_ view] addSubview:indicator_]; [scroller_ setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)]; [indicator_ setAutoresizingMask:UIViewAutoresizingFlexibleLeftMargin]; @@ -1594,14 +1594,14 @@ static Class $UIWebBrowserView; [self callFunction:function_]; else #endif - [self reloadButtonClicked]; + [self reloadButtonClicked]; } - (void) setPageActive:(BOOL)active { if (!active) [indicator_ removeFromSuperview]; else - [[[[self navigationItem] rightBarButtonItem] view] addSubview:indicator_]; + [[[[self navigationItem] rightBarButtonItem] view] addSubview:indicator_]; } - (void) resetViewAnimated:(BOOL)animated { diff --git a/UICaboodle/RVBook.h b/UICaboodle/RVBook.h index 09b1baf..8994cbf 100644 --- a/UICaboodle/RVBook.h +++ b/UICaboodle/RVBook.h @@ -7,7 +7,7 @@ @end @interface UCNavigationController : UINavigationController { - id hook_; + id hook_; } - (void) setHook:(id)hook; @end diff --git a/UICaboodle/RVBook.mm b/UICaboodle/RVBook.mm index ba201ae..beff51c 100644 --- a/UICaboodle/RVBook.mm +++ b/UICaboodle/RVBook.mm @@ -15,13 +15,13 @@ @implementation UCNavigationController - (void) setHook:(id)hook { - hook_ = hook; + hook_ = hook; } - (void) dismissModalViewControllerAnimated:(BOOL)animated { - [super dismissModalViewControllerAnimated:YES]; + [super dismissModalViewControllerAnimated:YES]; - if (hook_ != nil) - [hook_ didDismissModalViewController]; + if (hook_ != nil) + [hook_ didDismissModalViewController]; } @end diff --git a/UICaboodle/RVPage.h b/UICaboodle/RVPage.h index d2f84fa..3f16bc1 100644 --- a/UICaboodle/RVPage.h +++ b/UICaboodle/RVPage.h @@ -3,7 +3,7 @@ #import @interface UCViewController : UIViewController { - id delegate_; + id delegate_; } - (void)setDelegate:(id)delegate; - (void) reloadData; diff --git a/UICaboodle/RVPage.mm b/UICaboodle/RVPage.mm index aecf0d3..b225333 100644 --- a/UICaboodle/RVPage.mm +++ b/UICaboodle/RVPage.mm @@ -5,9 +5,9 @@ #import "RVBook.h" -@implementation UCViewController +@implementation UCViewController - (void)setDelegate:(id)delegate { - delegate_ = delegate; + delegate_ = delegate; } - (void) reloadData { } diff --git a/UICaboodle/UCString.h b/UICaboodle/UCString.h index d776728..13bb51f 100644 --- a/UICaboodle/UCString.h +++ b/UICaboodle/UCString.h @@ -29,7 +29,7 @@ - (NSString *) stringByAddingPercentEscapesIncludingReserved { return [(id)CFURLCreateStringByAddingPercentEscapes( - kCFAllocatorDefault, + kCFAllocatorDefault, (CFStringRef) self, NULL, CFSTR(";/?:@&=+$,"), -- cgit v1.2.3