From 485f16d60d257896f9cd964714db9f27b4b2d0c2 Mon Sep 17 00:00:00 2001 From: Grant Paul Date: Wed, 6 Oct 2010 20:34:07 -0700 Subject: [PATCH] Let UICaboodle build with clang++ as well as g++. Cydia needs additional changes. --- UICaboodle/BrowserView.h | 2 +- UICaboodle/BrowserView.mm | 8 ++++---- UICaboodle/RVBook.mm | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/UICaboodle/BrowserView.h b/UICaboodle/BrowserView.h index d7743091..c61fef41 100644 --- a/UICaboodle/BrowserView.h +++ b/UICaboodle/BrowserView.h @@ -25,7 +25,7 @@ @class IndirectDelegate; @interface WebScriptObject (UICaboodle) -- (unsigned) count; +- (NSUInteger) count; - (id) objectAtIndex:(unsigned)index; @end diff --git a/UICaboodle/BrowserView.mm b/UICaboodle/BrowserView.mm index 9b0c93d6..ff397637 100644 --- a/UICaboodle/BrowserView.mm +++ b/UICaboodle/BrowserView.mm @@ -161,7 +161,7 @@ static Class $UIWebBrowserView; @implementation WebScriptObject (UICaboodle) -- (unsigned) count { +- (NSUInteger) count { id length([self valueForKey:@"length"]); if ([length respondsToSelector:@selector(intValue)]) return [length intValue]; @@ -759,10 +759,10 @@ static Class $UIWebBrowserView; goto ignore; } - int store(_not(int)); + NSInteger store(_not(NSInteger)); if (NSURL *itms = [url itmsURL:&store]) { #if LogBrowser - NSLog(@"itms#%@#%u#%@", url, store, itms); + NSLog(@"itms#%@#%d#%@", url, (int) store, itms); #endif if (capability != nil && ( @@ -1144,7 +1144,7 @@ static Class $UIWebBrowserView; if ([frame parentFrame] == nil) { if (DOMDocument *document = [frame DOMDocument]) if (DOMNodeList *bodies = [document getElementsByTagName:@"body"]) - for (DOMHTMLBodyElement *body in bodies) { + for (DOMHTMLBodyElement *body in (id) bodies) { DOMCSSStyleDeclaration *style([document getComputedStyle:body pseudoElement:nil]); bool colored(false); diff --git a/UICaboodle/RVBook.mm b/UICaboodle/RVBook.mm index beff51c9..7fbbd5c3 100644 --- a/UICaboodle/RVBook.mm +++ b/UICaboodle/RVBook.mm @@ -14,7 +14,7 @@ @implementation UCNavigationController -- (void) setHook:(id)hook { +- (void) setHook:(id)hook { hook_ = hook; } - (void) dismissModalViewControllerAnimated:(BOOL)animated { -- 2.45.2