Let UICaboodle build with clang++ as well as g++. Cydia needs additional changes.

diff --git a/UICaboodle/BrowserView.h b/UICaboodle/BrowserView.h
index d77430913395b38480b34f84edc3737367767f76..c61fef41a4f8789216c5d9733dc19a4355f0e123 100644 (file)
--- 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 9b0c93d6e54635e79da49dd608dd25c2f6782cdf..ff39763790c338ee1a608f4bbd7d5079b1672810 100644 (file)
--- 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<NSFastEnumeration> *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 beff51c978c5c9987515f2de9892066bd7321fa7..7fbbd5c3c7bc5cc2ee22023009ae6580a099d0f3 100644 (file)
--- a/UICaboodle/RVBook.mm
+++ b/UICaboodle/RVBook.mm
@@ -14,7 +14,7 @@
 
 
 @implementation UCNavigationController
-- (void) setHook:(id)hook {
+- (void) setHook:(id<HookProtocol>)hook {
     hook_ = hook;
 }
 - (void) dismissModalViewControllerAnimated:(BOOL)animated {