Allow compiling with the Clang/Obj-C 2.0 ABI by fixing some ivar name duplicatio…
…ns that crash the compiler. Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
Showing
2 changed files
with
14 additions
and
14 deletions
| @@ -51,20 +51,20 @@ static const NSUInteger kDomainSection = 1; | @@ -51,20 +51,20 @@ static const NSUInteger kDomainSection = 1; | ||
| 51 | } | 51 | } |
| 52 | } | 52 | } |
| 53 | 53 | ||
| 54 | -+ (void)presentAuthenticationDialogForRequest:(ASIHTTPRequest *)request | 54 | ++ (void)presentAuthenticationDialogForRequest:(ASIHTTPRequest *)theRequest |
| 55 | { | 55 | { |
| 56 | // No need for a lock here, this will always be called on the main thread | 56 | // No need for a lock here, this will always be called on the main thread |
| 57 | if (!sharedDialog) { | 57 | if (!sharedDialog) { |
| 58 | sharedDialog = [[self alloc] init]; | 58 | sharedDialog = [[self alloc] init]; |
| 59 | - [sharedDialog setRequest:request]; | 59 | + [sharedDialog setRequest:theRequest]; |
| 60 | - if ([request authenticationNeeded] == ASIProxyAuthenticationNeeded) { | 60 | + if ([theRequest authenticationNeeded] == ASIProxyAuthenticationNeeded) { |
| 61 | [sharedDialog setType:ASIProxyAuthenticationType]; | 61 | [sharedDialog setType:ASIProxyAuthenticationType]; |
| 62 | } else { | 62 | } else { |
| 63 | [sharedDialog setType:ASIStandardAuthenticationType]; | 63 | [sharedDialog setType:ASIStandardAuthenticationType]; |
| 64 | } | 64 | } |
| 65 | [sharedDialog show]; | 65 | [sharedDialog show]; |
| 66 | } else { | 66 | } else { |
| 67 | - [requestsNeedingAuthentication addObject:request]; | 67 | + [requestsNeedingAuthentication addObject:theRequest]; |
| 68 | } | 68 | } |
| 69 | } | 69 | } |
| 70 | 70 |
| @@ -21,20 +21,20 @@ static NSLock *readLock = nil; | @@ -21,20 +21,20 @@ static NSLock *readLock = nil; | ||
| 21 | } | 21 | } |
| 22 | } | 22 | } |
| 23 | 23 | ||
| 24 | -+ (id)inputStreamWithFileAtPath:(NSString *)path request:(ASIHTTPRequest *)request | 24 | ++ (id)inputStreamWithFileAtPath:(NSString *)path request:(ASIHTTPRequest *)theRequest |
| 25 | { | 25 | { |
| 26 | - ASIInputStream *stream = [[[self alloc] init] autorelease]; | 26 | + ASIInputStream *theStream = [[[self alloc] init] autorelease]; |
| 27 | - [stream setRequest:request]; | 27 | + [theStream setRequest:theRequest]; |
| 28 | - [stream setStream:[NSInputStream inputStreamWithFileAtPath:path]]; | 28 | + [theStream setStream:[NSInputStream inputStreamWithFileAtPath:path]]; |
| 29 | - return stream; | 29 | + return theStream; |
| 30 | } | 30 | } |
| 31 | 31 | ||
| 32 | -+ (id)inputStreamWithData:(NSData *)data request:(ASIHTTPRequest *)request | 32 | ++ (id)inputStreamWithData:(NSData *)data request:(ASIHTTPRequest *)theRequest |
| 33 | { | 33 | { |
| 34 | - ASIInputStream *stream = [[[self alloc] init] autorelease]; | 34 | + ASIInputStream *theStream = [[[self alloc] init] autorelease]; |
| 35 | - [stream setRequest:request]; | 35 | + [theStream setRequest:theRequest]; |
| 36 | - [stream setStream:[NSInputStream inputStreamWithData:data]]; | 36 | + [theStream setStream:[NSInputStream inputStreamWithData:data]]; |
| 37 | - return stream; | 37 | + return theStream; |
| 38 | } | 38 | } |
| 39 | 39 | ||
| 40 | - (void)dealloc | 40 | - (void)dealloc |
-
Please register or login to post a comment