Initial clang compatability with some @synchronized hacks.

diff --git a/CyteKit/WebView.h b/CyteKit/WebView.h
index c9e10c8fa95fc4fb453de2714bb5e60cc859537f..39fd8ffe658ed5b5e2fd63410c3dddc3e613c0c1 100644 (file)
--- a/CyteKit/WebView.h
+++ b/CyteKit/WebView.h
@@ -58,6 +58,7 @@ enum CYWebPolicyDecision {
 };
 
 @protocol CyteWebViewDelegate <UIWebViewDelegate>
 };
 
 @protocol CyteWebViewDelegate <UIWebViewDelegate>

+@optional

 - (void) webView:(WebView *)view addMessageToConsole:(NSDictionary *)message;
 - (void) webView:(WebView *)view decidePolicyForNavigationAction:(NSDictionary *)action request:(NSURLRequest *)request frame:(WebFrame *)frame decisionListener:(id<WebPolicyDecisionListener>)listener;
 - (void) webView:(WebView *)view decidePolicyForNewWindowAction:(NSDictionary *)action request:(NSURLRequest *)request newFrameName:(NSString *)name decisionListener:(id<WebPolicyDecisionListener>)listener;
 - (void) webView:(WebView *)view addMessageToConsole:(NSDictionary *)message;
 - (void) webView:(WebView *)view decidePolicyForNavigationAction:(NSDictionary *)action request:(NSURLRequest *)request frame:(WebFrame *)frame decisionListener:(id<WebPolicyDecisionListener>)listener;
 - (void) webView:(WebView *)view decidePolicyForNewWindowAction:(NSDictionary *)action request:(NSURLRequest *)request newFrameName:(NSString *)name decisionListener:(id<WebPolicyDecisionListener>)listener;


@@ -81,6 +82,8 @@ enum CYWebPolicyDecision {
 }
 
 - (id<CyteWebViewDelegate>) delegate;
 }
 
 - (id<CyteWebViewDelegate>) delegate;

+- (void) setDelegate:(id<CyteWebViewDelegate>)delegate;
+

 - (void) dispatchEvent:(NSString *)event;
 - (void) reloadFromOrigin;
 - (UIScrollView *) scrollView;
 - (void) dispatchEvent:(NSString *)event;
 - (void) reloadFromOrigin;
 - (UIScrollView *) scrollView;

diff --git a/CyteKit/WebView.mm b/CyteKit/WebView.mm
index 1706cc031e4bf0c261059149af4d974d0d9d204a..084926b0eaa545c7ad31632c5d4b4a9e7ef1ba24 100644 (file)
--- a/CyteKit/WebView.mm
+++ b/CyteKit/WebView.mm
@@ -138,6 +138,10 @@
     return (id<CyteWebViewDelegate>) [super delegate];
 }
 
     return (id<CyteWebViewDelegate>) [super delegate];
 }
 

+- (void) setDelegate:(id<CyteWebViewDelegate>)delegate {
+    [super setDelegate:delegate];
+}
+

 /*- (WebView *) webView:(WebView *)view createWebViewWithRequest:(NSURLRequest *)request {
     id<CyteWebViewDelegate> delegate([self delegate]);
     WebView *created(nil);
 /*- (WebView *) webView:(WebView *)view createWebViewWithRequest:(NSURLRequest *)request {
     id<CyteWebViewDelegate> delegate([self delegate]);
     WebView *created(nil);

diff --git a/CyteKit/WebViewController.h b/CyteKit/WebViewController.h
index 9b9ba9406d9fe3c6479ee2ced7ea90a4917014bf..5807e785b0a549a4f351eeaea228e845c6863e95 100644 (file)
--- a/CyteKit/WebViewController.h
+++ b/CyteKit/WebViewController.h
@@ -138,6 +138,8 @@
 - (void) applyLeftButton;
 - (UIBarButtonItem *) leftButton;
 
 - (void) applyLeftButton;
 - (UIBarButtonItem *) leftButton;
 

+- (void) removeButton;
+

 - (void) _didStartLoading;
 - (void) _didFinishLoading;
 
 - (void) _didStartLoading;
 - (void) _didFinishLoading;
 

diff --git a/CyteKit/WebViewController.mm b/CyteKit/WebViewController.mm
index e5cfbb47d9f825e277f40814d7f3e9b34e998ce8..25e9aebb9f9c8e215f55b325484740b39b68b766 100644 (file)
--- a/CyteKit/WebViewController.mm
+++ b/CyteKit/WebViewController.mm
@@ -534,7 +534,7 @@ float CYScrollViewDecelerationRateNormal;
 
     if ([frame parentFrame] == nil) {
         if (DOMDocument *document = [frame DOMDocument])
 
     if ([frame parentFrame] == nil) {
         if (DOMDocument *document = [frame DOMDocument])

-            if (DOMNodeList<NSFastEnumeration> *bodies = [document getElementsByTagName:@"body"])
+            if (DOMNodeList *bodies = [document getElementsByTagName:@"body"])

                 for (DOMHTMLBodyElement *body in (id) bodies) {
                     DOMCSSStyleDeclaration *style([document getComputedStyle:body pseudoElement:nil]);
 
                 for (DOMHTMLBodyElement *body in (id) bodies) {
                     DOMCSSStyleDeclaration *style([document getComputedStyle:body pseudoElement:nil]);
 


@@ -697,7 +697,7 @@ float CYScrollViewDecelerationRateNormal;
 - (UIBarButtonItem *) customButton {
     if (custom_ == nil)
         return nil;
 - (UIBarButtonItem *) customButton {
     if (custom_ == nil)
         return nil;

-    else if (custom_ == [NSNull null])
+    else if ((/*clang:*/id) custom_ == [NSNull null])

         return (UIBarButtonItem *) [NSNull null];
 
     return [[[UIBarButtonItem alloc]
         return (UIBarButtonItem *) [NSNull null];
 
     return [[[UIBarButtonItem alloc]

diff --git a/CyteKit/WebViewTableViewCell.h b/CyteKit/WebViewTableViewCell.h
index c328e33d3330e9c2131ee9e62c2a2ebc6ad6324c..bff680e667b26f8d9a81737362996c9066be96a4 100644 (file)
--- a/CyteKit/WebViewTableViewCell.h
+++ b/CyteKit/WebViewTableViewCell.h
@@ -45,7 +45,9 @@
 #include "Menes/ObjectHandle.h"
 #include "CyteKit/WebView.h"
 
 #include "Menes/ObjectHandle.h"
 #include "CyteKit/WebView.h"
 

-@interface CyteWebViewTableViewCell : UITableViewCell {
+@interface CyteWebViewTableViewCell : UITableViewCell <
+    CyteWebViewDelegate
+> {

     // XXX: I'm not really the delegate here: fix this!
     _H<CyteWebView, 1> webview_;
 }
     // XXX: I'm not really the delegate here: fix this!
     _H<CyteWebView, 1> webview_;
 }

diff --git a/CyteKit/dispatchEvent.mm b/CyteKit/dispatchEvent.mm
index 76e24afc3ee1cbca8a93bdf2ce4303736a723fb2..81b7089b077d091c15084497ce89d7760ada66e0 100644 (file)
--- a/CyteKit/dispatchEvent.mm
+++ b/CyteKit/dispatchEvent.mm
@@ -94,7 +94,7 @@ MSHook(void, UIWebBrowserView$_webTouchEventsRecognized$, UIWebBrowserView *self
 __attribute__((__constructor__)) static void $() {
     if (Class $UIWebBrowserView = objc_getClass("UIWebBrowserView")) {
         if (Method method = class_getInstanceMethod($UIWebBrowserView, @selector(_webTouchEventsRecognized:))) {
 __attribute__((__constructor__)) static void $() {
     if (Class $UIWebBrowserView = objc_getClass("UIWebBrowserView")) {
         if (Method method = class_getInstanceMethod($UIWebBrowserView, @selector(_webTouchEventsRecognized:))) {

-            _UIWebBrowserView$_webTouchEventsRecognized$ = reinterpret_cast<void (*)(UIWebBrowserView *, SEL, id)>(method_getImplementation(method));
+            _UIWebBrowserView$_webTouchEventsRecognized$ = reinterpret_cast<void (*)(UIWebBrowserView *, SEL, UIWebTouchEventsGestureRecognizer *)>(method_getImplementation(method));

             method_setImplementation(method, reinterpret_cast<IMP>(&$UIWebBrowserView$_webTouchEventsRecognized$));
         }
     }
             method_setImplementation(method, reinterpret_cast<IMP>(&$UIWebBrowserView$_webTouchEventsRecognized$));
         }
     }

diff --git a/MobileCydia.mm b/MobileCydia.mm
index a2936ef2bc7718ad3e0bb0572ee92db13901b3b6..1d3a29d5631016fc9a7de957691622bbb7b2418c 100644 (file)
--- a/MobileCydia.mm
+++ b/MobileCydia.mm
@@ -1502,7 +1502,7 @@ static void PackageImport(const void *key, const void *value, void *context) {
 }
 
 - (NSString *) getField:(NSString *)name {
 }
 
 - (NSString *) getField:(NSString *)name {

-@synchronized (database_) {
+@synchronized ((id) database_) {

     if ([database_ era] != era_ || index_ == NULL)
         return nil;
 
     if ([database_ era] != era_ || index_ == NULL)
         return nil;
 


@@ -2178,7 +2178,7 @@ struct PackageNameOrdering :
 }
 
 - (NSArray *) relations {
 }
 
 - (NSArray *) relations {

-@synchronized (database_) {
+@synchronized ((id) database_) {

     NSMutableArray *relations([NSMutableArray arrayWithCapacity:16]);
     for (pkgCache::DepIterator dep(version_.DependsList()); !dep.end(); ++dep)
         [relations addObject:[[[CydiaRelation alloc] initWithIterator:dep] autorelease]];
     NSMutableArray *relations([NSMutableArray arrayWithCapacity:16]);
     for (pkgCache::DepIterator dep(version_.DependsList()); !dep.end(); ++dep)
         [relations addObject:[[[CydiaRelation alloc] initWithIterator:dep] autorelease]];


@@ -2187,12 +2187,12 @@ struct PackageNameOrdering :
 
 - (NSString *) architecture {
     [self parse];
 
 - (NSString *) architecture {
     [self parse];

-@synchronized (database_) {
+@synchronized ((id) database_) {

     return parsed_->architecture_.empty() ? [NSNull null] : (id) parsed_->architecture_;
 } }
 
 - (NSString *) getField:(NSString *)name {
     return parsed_->architecture_.empty() ? [NSNull null] : (id) parsed_->architecture_;
 } }
 
 - (NSString *) getField:(NSString *)name {

-@synchronized (database_) {
+@synchronized ((id) database_) {

     if ([database_ era] != era_ || file_.end())
         return nil;
 
     if ([database_ era] != era_ || file_.end())
         return nil;
 


@@ -2208,7 +2208,7 @@ struct PackageNameOrdering :
 - (void) parse {
     if (parsed_ != NULL)
         return;
 - (void) parse {
     if (parsed_ != NULL)
         return;

-@synchronized (database_) {
+@synchronized ((id) database_) {

     if ([database_ era] != era_ || file_.end())
         return;
 
     if ([database_ era] != era_ || file_.end())
         return;
 


@@ -2464,7 +2464,7 @@ struct PackageNameOrdering :
 }
 
 - (MIMEAddress *) maintainer {
 }
 
 - (MIMEAddress *) maintainer {

-@synchronized (database_) {
+@synchronized ((id) database_) {

     if ([database_ era] != era_ || file_.end())
         return nil;
 
     if ([database_ era] != era_ || file_.end())
         return nil;
 


@@ -2478,7 +2478,7 @@ struct PackageNameOrdering :
 }
 
 - (size_t) size {
 }
 
 - (size_t) size {

-@synchronized (database_) {
+@synchronized ((id) database_) {

     if ([database_ era] != era_ || version_.end())
         return 0;
 
     if ([database_ era] != era_ || version_.end())
         return 0;
 


@@ -2486,7 +2486,7 @@ struct PackageNameOrdering :
 } }
 
 - (NSString *) longDescription {
 } }
 
 - (NSString *) longDescription {

-@synchronized (database_) {
+@synchronized ((id) database_) {

     if ([database_ era] != era_ || file_.end())
         return nil;
 
     if ([database_ era] != era_ || file_.end())
         return nil;
 


@@ -2511,7 +2511,7 @@ struct PackageNameOrdering :
     if (parsed_ != NULL)
         return static_cast<NSString *>(parsed_->tagline_);
 
     if (parsed_ != NULL)
         return static_cast<NSString *>(parsed_->tagline_);
 

-@synchronized (database_) {
+@synchronized ((id) database_) {

     pkgRecords::Parser &parser([database_ records]->Lookup(file_));
 
     const char *start, *end;
     pkgRecords::Parser &parser([database_ records]->Lookup(file_));
 
     const char *start, *end;


@@ -2649,7 +2649,7 @@ struct PackageNameOrdering :
 }
 
 - (BOOL) hasMode {
 }
 
 - (BOOL) hasMode {

-@synchronized (database_) {
+@synchronized ((id) database_) {

     if ([database_ era] != era_ || iterator_.end())
         return nil;
 
     if ([database_ era] != era_ || iterator_.end())
         return nil;
 


@@ -2658,7 +2658,7 @@ struct PackageNameOrdering :
 } }
 
 - (NSString *) mode {
 } }
 
 - (NSString *) mode {

-@synchronized (database_) {
+@synchronized ((id) database_) {

     if ([database_ era] != era_ || iterator_.end())
         return nil;
 
     if ([database_ era] != era_ || iterator_.end())
         return nil;
 


@@ -2758,7 +2758,7 @@ struct PackageNameOrdering :
 }
 
 - (NSString *) state {
 }
 
 - (NSString *) state {

-@synchronized (database_) {
+@synchronized ((id) database_) {

     if ([database_ era] != era_ || file_.end())
         return nil;
 
     if ([database_ era] != era_ || file_.end())
         return nil;
 


@@ -2785,7 +2785,7 @@ struct PackageNameOrdering :
 } }
 
 - (NSString *) selection {
 } }
 
 - (NSString *) selection {

-@synchronized (database_) {
+@synchronized ((id) database_) {

     if ([database_ era] != era_ || file_.end())
         return nil;
 
     if ([database_ era] != era_ || file_.end())
         return nil;
 


@@ -2891,7 +2891,7 @@ struct PackageNameOrdering :
 
 - (Source *) source {
     if (source_ == nil) {
 
 - (Source *) source {
     if (source_ == nil) {

-        @synchronized (database_) {
+        @synchronized ((id) database_) {

             if ([database_ era] != era_ || file_.end())
                 source_ = (Source *) [NSNull null];
             else
             if ([database_ era] != era_ || file_.end())
                 source_ = (Source *) [NSNull null];
             else


@@ -3014,7 +3014,7 @@ struct PackageNameOrdering :
 }
 
 - (void) clear {
 }
 
 - (void) clear {

-@synchronized (database_) {
+@synchronized ((id) database_) {

     pkgProblemResolver *resolver = [database_ resolver];
     resolver->Clear(iterator_);
 
     pkgProblemResolver *resolver = [database_ resolver];
     resolver->Clear(iterator_);
 


@@ -3024,7 +3024,7 @@ struct PackageNameOrdering :
 } }
 
 - (void) install {
 } }
 
 - (void) install {

-@synchronized (database_) {
+@synchronized ((id) database_) {

     pkgProblemResolver *resolver = [database_ resolver];
     resolver->Clear(iterator_);
     resolver->Protect(iterator_);
     pkgProblemResolver *resolver = [database_ resolver];
     resolver->Clear(iterator_);
     resolver->Protect(iterator_);


@@ -3039,7 +3039,7 @@ struct PackageNameOrdering :
 } }
 
 - (void) remove {
 } }
 
 - (void) remove {

-@synchronized (database_) {
+@synchronized ((id) database_) {

     pkgProblemResolver *resolver = [database_ resolver];
     resolver->Clear(iterator_);
     resolver->Remove(iterator_);
     pkgProblemResolver *resolver = [database_ resolver];
     resolver->Clear(iterator_);
     resolver->Remove(iterator_);


@@ -3364,7 +3364,7 @@ class CydiaLogCleaner :
 - (Package *) packageWithName:(NSString *)name {
     if (name == nil)
         return nil;
 - (Package *) packageWithName:(NSString *)name {
     if (name == nil)
         return nil;

-@synchronized (self) {
+@synchronized ((id) self) {

     if (static_cast<pkgDepCache *>(cache_) == NULL)
         return nil;
     pkgCache::PkgIterator iterator(cache_->FindPkg([name UTF8String]));
     if (static_cast<pkgDepCache *>(cache_) == NULL)
         return nil;
     pkgCache::PkgIterator iterator(cache_->FindPkg([name UTF8String]));


@@ -3504,7 +3504,7 @@ class CydiaLogCleaner :
 }
 
 - (void) reloadDataWithInvocation:(NSInvocation *)invocation {
 }
 
 - (void) reloadDataWithInvocation:(NSInvocation *)invocation {

-@synchronized (self) {
+@synchronized ((id) self) {

     ++era_;
 
     [self releasePackages];
     ++era_;
 
     [self releasePackages];


@@ -3684,7 +3684,7 @@ class CydiaLogCleaner :
 } }
 
 - (void) clear {
 } }
 
 - (void) clear {

-@synchronized (self) {
+@synchronized ((id) self) {

     delete resolver_;
     resolver_ = new pkgProblemResolver(cache_);
 
     delete resolver_;
     resolver_ = new pkgProblemResolver(cache_);
 


@@ -3703,7 +3703,7 @@ class CydiaLogCleaner :
 }
 
 - (bool) clean {
 }
 
 - (bool) clean {

-@synchronized (self) {
+@synchronized ((id) self) {

     // XXX: I don't remember this condition
     if (lock_ != NULL)
         return false;
     // XXX: I don't remember this condition
     if (lock_ != NULL)
         return false;


@@ -3970,7 +3970,7 @@ static _H<NSMutableSet> Diversions_;
 @end
 
 @interface CydiaObject : NSObject {
 @end
 
 @interface CydiaObject : NSObject {

-    _H<IndirectDelegate> indirect_;
+    _H<CyteWebViewController> indirect_;

     _transient id delegate_;
 }
 
     _transient id delegate_;
 }
 


@@ -3996,7 +3996,7 @@ static _H<NSMutableSet> Diversions_;
 
 - (id) initWithDelegate:(IndirectDelegate *)indirect {
     if ((self = [super init]) != nil) {
 
 - (id) initWithDelegate:(IndirectDelegate *)indirect {
     if ((self = [super init]) != nil) {

-        indirect_ = indirect;
+        indirect_ = (CyteWebViewController *) indirect;

     } return self;
 }
 
     } return self;
 }
 


@@ -4278,7 +4278,7 @@ static _H<NSMutableSet> Diversions_;
 }
 
 - (NSArray *) getMetadataKeys {
 }
 
 - (NSArray *) getMetadataKeys {

-@synchronized (Values_) {
+@synchronized ((id) Values_) {

     return [Values_ allKeys];
 } }
 
     return [Values_ allKeys];
 } }
 


@@ -4292,12 +4292,12 @@ static _H<NSMutableSet> Diversions_;
 }
 
 - (id) getMetadataValue:(NSString *)key {
 }
 
 - (id) getMetadataValue:(NSString *)key {

-@synchronized (Values_) {
+@synchronized ((id) Values_) {

     return [Values_ objectForKey:key];
 } }
 
 - (void) setMetadataValue:(NSString *)key :(NSString *)value {
     return [Values_ objectForKey:key];
 } }
 
 - (void) setMetadataValue:(NSString *)key :(NSString *)value {

-@synchronized (Values_) {
+@synchronized ((id) Values_) {

     if (value == nil || value == (id) [WebUndefined undefined] || value == (id) [NSNull null])
         [Values_ removeObjectForKey:key];
     else
     if (value == nil || value == (id) [WebUndefined undefined] || value == (id) [NSNull null])
         [Values_ removeObjectForKey:key];
     else


@@ -4307,12 +4307,12 @@ static _H<NSMutableSet> Diversions_;
 } }
 
 - (id) getSessionValue:(NSString *)key {
 } }
 
 - (id) getSessionValue:(NSString *)key {

-@synchronized (SessionData_) {
+@synchronized ((id) SessionData_) {

     return [SessionData_ objectForKey:key];
 } }
 
 - (void) setSessionValue:(NSString *)key :(NSString *)value {
     return [SessionData_ objectForKey:key];
 } }
 
 - (void) setSessionValue:(NSString *)key :(NSString *)value {

-@synchronized (SessionData_) {
+@synchronized ((id) SessionData_) {

     if (value == (id) [WebUndefined undefined])
         [SessionData_ removeObjectForKey:key];
     else
     if (value == (id) [WebUndefined undefined])
         [SessionData_ removeObjectForKey:key];
     else


@@ -4320,22 +4320,22 @@ static _H<NSMutableSet> Diversions_;
 } }
 
 - (void) addBridgedHost:(NSString *)host {
 } }
 
 - (void) addBridgedHost:(NSString *)host {

-@synchronized (HostConfig_) {
+@synchronized ((id) HostConfig_) {

     [BridgedHosts_ addObject:host];
 } }
 
 - (void) addInsecureHost:(NSString *)host {
     [BridgedHosts_ addObject:host];
 } }
 
 - (void) addInsecureHost:(NSString *)host {

-@synchronized (HostConfig_) {
+@synchronized ((id) HostConfig_) {

     [InsecureHosts_ addObject:host];
 } }
 
 - (void) addTokenHost:(NSString *)host {
     [InsecureHosts_ addObject:host];
 } }
 
 - (void) addTokenHost:(NSString *)host {

-@synchronized (HostConfig_) {
+@synchronized ((id) HostConfig_) {

     [TokenHosts_ addObject:host];
 } }
 
 - (void) addPipelinedHost:(NSString *)host scheme:(NSString *)scheme {
     [TokenHosts_ addObject:host];
 } }
 
 - (void) addPipelinedHost:(NSString *)host scheme:(NSString *)scheme {

-@synchronized (HostConfig_) {
+@synchronized ((id) HostConfig_) {

     if (scheme != (id) [WebUndefined undefined])
         host = [NSString stringWithFormat:@"%@:%@", [scheme lowercaseString], host];
 
     if (scheme != (id) [WebUndefined undefined])
         host = [NSString stringWithFormat:@"%@:%@", [scheme lowercaseString], host];
 


@@ -4380,7 +4380,7 @@ static _H<NSMutableSet> Diversions_;
 
 - (NSArray *) getInstalledPackages {
     Database *database([Database sharedInstance]);
 
 - (NSArray *) getInstalledPackages {
     Database *database([Database sharedInstance]);

-@synchronized (database) {
+@synchronized ((id) database) {

     NSArray *packages([database packages]);
     NSMutableArray *installed([NSMutableArray arrayWithCapacity:1024]);
     for (Package *package in packages)
     NSArray *packages([database packages]);
     NSMutableArray *installed([NSMutableArray arrayWithCapacity:1024]);
     for (Package *package in packages)


@@ -4578,7 +4578,7 @@ static _H<NSMutableSet> Diversions_;
     if ([[[self scheme] lowercaseString] isEqualToString:@"https"])
         return true;
 
     if ([[[self scheme] lowercaseString] isEqualToString:@"https"])
         return true;
 

-    @synchronized (HostConfig_) {
+    @synchronized ((id) HostConfig_) {

         if ([InsecureHosts_ containsObject:[self host]])
             return true;
     }
         if ([InsecureHosts_ containsObject:[self host]])
             return true;
     }


@@ -4618,7 +4618,7 @@ static _H<NSMutableSet> Diversions_;
 
     bool bridged(false);
 
 
     bool bridged(false);
 

-    @synchronized (HostConfig_) {
+    @synchronized ((id) HostConfig_) {

         if ([scheme isEqualToString:@"file"])
             bridged = true;
         else if ([scheme isEqualToString:@"https"])
         if ([scheme isEqualToString:@"file"])
             bridged = true;
         else if ([scheme isEqualToString:@"https"])


@@ -4673,7 +4673,7 @@ static _H<NSMutableSet> Diversions_;
     bool bridged;
     bool token;
 
     bool bridged;
     bool token;
 

-    @synchronized (HostConfig_) {
+    @synchronized ((id) HostConfig_) {

         bridged = [BridgedHosts_ containsObject:host];
         token = [TokenHosts_ containsObject:host];
     }
         bridged = [BridgedHosts_ containsObject:host];
         token = [TokenHosts_ containsObject:host];
     }


@@ -6275,7 +6275,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (Package *) packageAtIndexPath:(NSIndexPath *)path {
 }
 
 - (Package *) packageAtIndexPath:(NSIndexPath *)path {

-@synchronized (database_) {
+@synchronized ((id) database_) {

     if ([database_ era] != era_)
         return nil;
 
     if ([database_ era] != era_)
         return nil;
 


@@ -6372,7 +6372,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (NSMutableArray *) _reloadPackages {
 }
 
 - (NSMutableArray *) _reloadPackages {

-@synchronized (database_) {
+@synchronized ((id) database_) {

     era_ = [database_ era];
     NSArray *packages([database_ packages]);
 
     era_ = [database_ era];
     NSArray *packages([database_ packages]);
 


@@ -6409,7 +6409,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         packages = [self _reloadPackages];
     }
 
         packages = [self _reloadPackages];
     }
 

-@synchronized (database_) {
+@synchronized ((id) database_) {

     if (era_ != [database_ era])
         goto reload;
     reloading_ = 0;
     if (era_ != [database_ era])
         goto reload;
     reloading_ = 0;


@@ -6549,7 +6549,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (void) setFilter:(SEL)filter {
 }
 
 - (void) setFilter:(SEL)filter {

-@synchronized (self) {
+@synchronized ((id) self) {

     filter_ = filter;
 
     /* XXX: this is an unsafe optimization of doomy hell */
     filter_ = filter;
 
     /* XXX: this is an unsafe optimization of doomy hell */


@@ -6560,18 +6560,18 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 } }
 
 - (void) setObject:(id)object {
 } }
 
 - (void) setObject:(id)object {

-@synchronized (self) {
+@synchronized ((id) self) {

     object_ = object;
 } }
 
 - (void) setObject:(id)object forFilter:(SEL)filter {
     object_ = object;
 } }
 
 - (void) setObject:(id)object forFilter:(SEL)filter {

-@synchronized (self) {
+@synchronized ((id) self) {

     [self setFilter:filter];
     [self setObject:object];
 } }
 
 - (NSMutableArray *) _reloadPackages {
     [self setFilter:filter];
     [self setObject:object];
 } }
 
 - (NSMutableArray *) _reloadPackages {

-@synchronized (database_) {
+@synchronized ((id) database_) {

     era_ = [database_ era];
     NSArray *packages([database_ packages]);
 
     era_ = [database_ era];
     NSArray *packages([database_ packages]);
 


@@ -6581,7 +6581,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     SEL filter;
     _H<NSObject> object;
 
     SEL filter;
     _H<NSObject> object;
 

-    @synchronized (self) {
+    @synchronized ((id) self) {

         imp = imp_;
         filter = filter_;
         object = object_;
         imp = imp_;
         filter = filter_;
         object = object_;


@@ -6895,6 +6895,9 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
 }
 
 - (void) setUnselectedViewController:(UIViewController *)transient {
 }
 
 - (void) setUnselectedViewController:(UIViewController *)transient {

+    // UITabBarController on 2.x works differently (and it's not worth supporting fully),
+    // so just add it to the first tab's navigation stack instead, which probably works.
+    // XXX: this assumes that the first tab bar controller is a UINavigationController

     if (kCFCoreFoundationVersionNumber < kCFCoreFoundationVersionNumber_iPhoneOS_3_0) {
         if (transient != nil) {
             [[[self viewControllers] objectAtIndex:0] pushViewController:transient animated:YES];
     if (kCFCoreFoundationVersionNumber < kCFCoreFoundationVersionNumber_iPhoneOS_3_0) {
         if (transient != nil) {
             [[[self viewControllers] objectAtIndex:0] pushViewController:transient animated:YES];


@@ -7659,6 +7662,7 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
 
 /* Changes Controller {{{ */
 @interface ChangesController : CyteViewController <
 
 /* Changes Controller {{{ */
 @interface ChangesController : CyteViewController <

+    CyteWebViewDelegate,

     UITableViewDataSource,
     UITableViewDelegate
 > {
     UITableViewDataSource,
     UITableViewDelegate
 > {


@@ -7706,7 +7710,7 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
 }
 
 - (Package *) packageAtIndexPath:(NSIndexPath *)path {
 }
 
 - (Package *) packageAtIndexPath:(NSIndexPath *)path {

-@synchronized (database_) {
+@synchronized ((id) database_) {

     if ([database_ era] != era_)
         return nil;
 
     if ([database_ era] != era_)
         return nil;
 


@@ -7881,7 +7885,7 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
 }
 
 - (NSMutableArray *) _reloadPackages {
 }
 
 - (NSMutableArray *) _reloadPackages {

-@synchronized (database_) {
+@synchronized ((id) database_) {

     era_ = [database_ era];
     NSArray *packages([database_ packages]);
 
     era_ = [database_ era];
     NSArray *packages([database_ packages]);
 


@@ -7916,7 +7920,7 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
         packages = [self _reloadPackages];
     }
 
         packages = [self _reloadPackages];
     }
 

-@synchronized (database_) {
+@synchronized ((id) database_) {

     if (era_ != [database_ era])
         goto reload;
 
     if (era_ != [database_ era])
         goto reload;
 


@@ -8618,7 +8622,7 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
 }
 
 - (Source *) sourceAtIndexPath:(NSIndexPath *)indexPath {
 }
 
 - (Source *) sourceAtIndexPath:(NSIndexPath *)indexPath {

-@synchronized (database_) {
+@synchronized ((id) database_) {

     if ([database_ era] != era_)
         return nil;
 
     if ([database_ era] != era_)
         return nil;
 


@@ -8909,7 +8913,7 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
 - (void) reloadData {
     [super reloadData];
 
 - (void) reloadData {
     [super reloadData];
 

-@synchronized (database_) {
+@synchronized ((id) database_) {

     era_ = [database_ era];
 
     sources_ = [NSMutableArray arrayWithCapacity:16];
     era_ = [database_ era];
 
     sources_ = [NSMutableArray arrayWithCapacity:16];


@@ -9293,7 +9297,7 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
                 NSLog(@"###: %@", [url absoluteString]);
 #endif
 
                 NSLog(@"###: %@", [url absoluteString]);
 #endif
 

-                @synchronized (HostConfig_) {
+                @synchronized ((id) HostConfig_) {

                     [CachedURLs_ addObject:url];
                 }
             }
                     [CachedURLs_ addObject:url];
                 }
             }


@@ -9384,7 +9388,7 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
 }
 
 - (void) _saveConfig {
 }
 
 - (void) _saveConfig {

-    @synchronized (database_) {
+    @synchronized ((id) database_) {

         _trace();
         MetaFile_.Sync();
         _trace();
         _trace();
         MetaFile_.Sync();
         _trace();


@@ -9469,7 +9473,7 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
 }
 
 - (void) reloadDataWithInvocation:(NSInvocation *)invocation {
 }
 
 - (void) reloadDataWithInvocation:(NSInvocation *)invocation {

-@synchronized (self) {
+@synchronized ((id) self) {

     UIProgressHUD *hud(loaded_ ? [self addProgressHUD] : nil);
     [hud setText:UCLocalize("RELOADING_DATA")];
 
     UIProgressHUD *hud(loaded_ ? [self addProgressHUD] : nil);
     [hud setText:UCLocalize("RELOADING_DATA")];
 


@@ -9638,13 +9642,13 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
 }
 
 - (void) queue {
 }
 
 - (void) queue {

-    @synchronized (self) {
+    @synchronized ((id) self) {

         [self perform];
     }
 }
 
 - (void) clearPackage:(Package *)package {
         [self perform];
     }
 }
 
 - (void) clearPackage:(Package *)package {

-    @synchronized (self) {
+    @synchronized ((id) self) {

         [package clear];
         [self resolve];
         [self perform];
         [package clear];
         [self resolve];
         [self perform];


@@ -9652,7 +9656,7 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
 }
 
 - (void) installPackages:(NSArray *)packages {
 }
 
 - (void) installPackages:(NSArray *)packages {

-    @synchronized (self) {
+    @synchronized ((id) self) {

         for (Package *package in packages)
             [package install];
         [self resolve];
         for (Package *package in packages)
             [package install];
         [self resolve];


@@ -9661,7 +9665,7 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
 }
 
 - (void) installPackage:(Package *)package {
 }
 
 - (void) installPackage:(Package *)package {

-    @synchronized (self) {
+    @synchronized ((id) self) {

         [package install];
         [self resolve];
         [self perform];
         [package install];
         [self resolve];
         [self perform];


@@ -9669,7 +9673,7 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
 }
 
 - (void) removePackage:(Package *)package {
 }
 
 - (void) removePackage:(Package *)package {

-    @synchronized (self) {
+    @synchronized ((id) self) {

         [package remove];
         [self resolve];
         [self perform];
         [package remove];
         [self resolve];
         [self perform];


@@ -9677,7 +9681,7 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
 }
 
 - (void) distUpgrade {
 }
 
 - (void) distUpgrade {

-    @synchronized (self) {
+    @synchronized ((id) self) {

         if (![database_ upgrade])
             return;
         [self perform];
         if (![database_ upgrade])
             return;
         [self perform];


@@ -9734,7 +9738,7 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
 }
 
 - (void) cancelAndClear:(bool)clear {
 }
 
 - (void) cancelAndClear:(bool)clear {

-    @synchronized (self) {
+    @synchronized ((id) self) {

         if (clear) {
             [database_ clear];
             Queuing_ = false;
         if (clear) {
             [database_ clear];
             Queuing_ = false;


@@ -9760,7 +9764,7 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
         [alert dismissWithClickedButtonIndex:-1 animated:YES];
     } else if ([context isEqualToString:@"fixhalf"]) {
         if (button == [alert cancelButtonIndex]) {
         [alert dismissWithClickedButtonIndex:-1 animated:YES];
     } else if ([context isEqualToString:@"fixhalf"]) {
         if (button == [alert cancelButtonIndex]) {

-            @synchronized (self) {
+            @synchronized ((id) self) {

                 for (Package *broken in (id) broken_) {
                     [broken remove];
 
                 for (Package *broken in (id) broken_) {
                     [broken remove];
 


@@ -9782,7 +9786,7 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
         [alert dismissWithClickedButtonIndex:-1 animated:YES];
     } else if ([context isEqualToString:@"upgrade"]) {
         if (button == [alert firstOtherButtonIndex]) {
         [alert dismissWithClickedButtonIndex:-1 animated:YES];
     } else if ([context isEqualToString:@"upgrade"]) {
         if (button == [alert firstOtherButtonIndex]) {

-            @synchronized (self) {
+            @synchronized ((id) self) {

                 for (Package *essential in (id) essential_)
                     [essential install];
 
                 for (Package *essential in (id) essential_)
                     [essential install];
 


@@ -10149,7 +10153,7 @@ _trace();
     if ([self respondsToSelector:@selector(setApplicationSupportsShakeToEdit:)])
         [self setApplicationSupportsShakeToEdit:NO];
 
     if ([self respondsToSelector:@selector(setApplicationSupportsShakeToEdit:)])
         [self setApplicationSupportsShakeToEdit:NO];
 

-    @synchronized (HostConfig_) {
+    @synchronized ((id) HostConfig_) {

         [BridgedHosts_ addObject:[[NSURL URLWithString:CydiaURL(@"")] host]];
     }
 
         [BridgedHosts_ addObject:[[NSURL URLWithString:CydiaURL(@"")] host]];
     }
 


@@ -10412,7 +10416,7 @@ MSHook(id, NSURLConnection$init$, NSURLConnection *self, SEL _cmd, NSURLRequest
 
     NSString *compound([NSString stringWithFormat:@"%@:%@", scheme, host]);
 
 
     NSString *compound([NSString stringWithFormat:@"%@:%@", scheme, host]);
 

-    @synchronized (HostConfig_) {
+    @synchronized ((id) HostConfig_) {

         if ([copy respondsToSelector:@selector(setHTTPShouldUsePipelining:)])
             if ([PipelinedHosts_ containsObject:host] || [PipelinedHosts_ containsObject:compound])
                 [copy setHTTPShouldUsePipelining:YES];
         if ([copy respondsToSelector:@selector(setHTTPShouldUsePipelining:)])
             if ([PipelinedHosts_ containsObject:host] || [PipelinedHosts_ containsObject:compound])
                 [copy setHTTPShouldUsePipelining:YES];


@@ -10438,7 +10442,7 @@ MSHook(id, NSURLConnection$init$, NSURLConnection *self, SEL _cmd, NSURLRequest
 
 Class $WAKWindow;
 
 
 Class $WAKWindow;
 

-static CGSize $WAKWindow$screenSize(WAKWindow self, SEL _cmd) {
+static CGSize $WAKWindow$screenSize(WAKWindow *self, SEL _cmd) {

     CGSize size([[UIScreen mainScreen] bounds].size);
     /*if ([$WAKWindow respondsToSelector:@selector(hasLandscapeOrientation)])
         if ([$WAKWindow hasLandscapeOrientation])
     CGSize size([[UIScreen mainScreen] bounds].size);
     /*if ([$WAKWindow respondsToSelector:@selector(hasLandscapeOrientation)])
         if ([$WAKWindow hasLandscapeOrientation])


@@ -10488,7 +10492,7 @@ int main(int argc, char *argv[]) {
     SessionData_ = [NSMutableDictionary dictionaryWithCapacity:4];
 
     HostConfig_ = [[[NSObject alloc] init] autorelease];
     SessionData_ = [NSMutableDictionary dictionaryWithCapacity:4];
 
     HostConfig_ = [[[NSObject alloc] init] autorelease];

-    @synchronized (HostConfig_) {
+    @synchronized ((id) HostConfig_) {

         BridgedHosts_ = [NSMutableSet setWithCapacity:4];
         TokenHosts_ = [NSMutableSet setWithCapacity:4];
         InsecureHosts_ = [NSMutableSet setWithCapacity:4];
         BridgedHosts_ = [NSMutableSet setWithCapacity:4];
         TokenHosts_ = [NSMutableSet setWithCapacity:4];
         InsecureHosts_ = [NSMutableSet setWithCapacity:4];

diff --git a/makefile b/makefile
index f7933f7cf25cbb7be417783da45e814b2bc931e8..b4e33e223d0942e81df502b69033558c94dafda5 100644 (file)
--- a/makefile
+++ b/makefile
@@ -2,7 +2,9 @@ sdks := /Developer/Platforms/iPhoneOS.platform/Developer/SDKs
 ioss := $(sort $(patsubst $(sdks)/iPhoneOS%.sdk,%,$(wildcard $(sdks)/iPhoneOS*.sdk)))
 
 ios := $(word $(words $(ioss)),$(ioss))
 ioss := $(sort $(patsubst $(sdks)/iPhoneOS%.sdk,%,$(wildcard $(sdks)/iPhoneOS*.sdk)))
 
 ios := $(word $(words $(ioss)),$(ioss))

+

 gcc := 4.2
 gcc := 4.2

+gcc :=

 
 flags := 
 link := 
 
 flags := 
 link := 


@@ -21,18 +23,24 @@ endif
 sdk := $(sdks)/iPhoneOS$(ios).sdk
 
 flags += -F$(sdk)/System/Library/PrivateFrameworks
 sdk := $(sdks)/iPhoneOS$(ios).sdk
 
 flags += -F$(sdk)/System/Library/PrivateFrameworks

-flags += -I. -isystem sysroot/usr/include -Lsysroot/usr/lib
-flags += -Wall -Werror -Wno-deprecated-declarations
+flags += -I. -isystem sysroot/usr/include
+flags += -Wall -Wno-deprecated-declarations
+flags += -Wno-logical-op-parentheses

 flags += -fmessage-length=0
 flags += -g0 -O2
 flags += -fobjc-exceptions
 flags += -fmessage-length=0
 flags += -g0 -O2
 flags += -fobjc-exceptions

-flags += -fno-guess-branch-probability

 flags += -fvisibility=hidden
 
 flags += -fvisibility=hidden
 

+ifneq ($(gcc),)
+flags += -fno-guess-branch-probability
+endif
+

 xflags :=
 xflags += -fobjc-call-cxx-cdtors
 xflags += -fvisibility-inlines-hidden
 
 xflags :=
 xflags += -fobjc-call-cxx-cdtors
 xflags += -fvisibility-inlines-hidden
 

+link += -Lsysroot/usr/lib
+

 link += -framework CoreFoundation
 link += -framework CoreGraphics
 link += -framework Foundation
 link += -framework CoreFoundation
 link += -framework CoreGraphics
 link += -framework Foundation


@@ -59,9 +67,14 @@ backrow += -FAppleTV -framework BackRow -framework AppleTV
 
 version := $(shell ./version.sh)
 
 
 version := $(shell ./version.sh)
 

-#cycc = cycc -r4.2 -i$(ios) -o$@
+ifeq ($(gcc),)
+gxx := /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/clang++
+else

 gxx := /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/g++-$(gcc)
 gxx := /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/g++-$(gcc)

+endif
+

 cycc = $(gxx) -mthumb -arch armv6 -o $@ -mcpu=arm1176jzf-s -miphoneos-version-min=2.0 -isysroot $(sdk) -idirafter /usr/include -F{sysroot,}/Library/Frameworks
 cycc = $(gxx) -mthumb -arch armv6 -o $@ -mcpu=arm1176jzf-s -miphoneos-version-min=2.0 -isysroot $(sdk) -idirafter /usr/include -F{sysroot,}/Library/Frameworks

+#cycc = cycc -r4.2 -i$(ios) -o$@

 
 dirs := Menes CyteKit Cydia SDURLCache
 
 
 dirs := Menes CyteKit Cydia SDURLCache