Permalink
Browse files

Fix compile errors under XCode 3.2.5 & LLVM 1.6

Clang doesn't like local variables or parameter names that conflict with
instance property names. This problem occurs even in class methods (in
addition to instance methods).

Signed-off-by: Tim Shadel <github@timshadel.com>
  • Loading branch information...
1 parent 223acae commit ad37b628b39080eb9eb63b69dd3383fcdb09f43d @timshadel timshadel committed Nov 16, 2010
@@ -450,7 +450,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
return cell;
}
-- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+- (NSInteger)tableView:(UITableView *)aTableView numberOfRowsInSection:(NSInteger)section
{
if (section == 0) {
return 2;
View
@@ -11,11 +11,11 @@
@implementation ASIS3Bucket
-+ (id)bucketWithOwnerID:(NSString *)ownerID ownerName:(NSString *)ownerName
++ (id)bucketWithOwnerID:(NSString *)anOwnerID ownerName:(NSString *)anOwnerName
{
ASIS3Bucket *bucket = [[[self alloc] init] autorelease];
- [bucket setOwnerID:ownerID];
- [bucket setOwnerName:ownerName];
+ [bucket setOwnerID:anOwnerID];
+ [bucket setOwnerName:anOwnerName];
return bucket;
}
@@ -11,10 +11,10 @@
@implementation ASIS3BucketObject
-+ (id)objectWithBucket:(NSString *)bucket
++ (id)objectWithBucket:(NSString *)theBucket
{
ASIS3BucketObject *object = [[[self alloc] init] autorelease];
- [object setBucket:bucket];
+ [object setBucket:theBucket];
return object;
}
@@ -28,32 +28,32 @@ - (id)initWithURL:(NSURL *)newURL
return self;
}
-+ (id)requestWithBucket:(NSString *)bucket
++ (id)requestWithBucket:(NSString *)theBucket
{
ASIS3BucketRequest *request = [[[self alloc] initWithURL:nil] autorelease];
- [request setBucket:bucket];
+ [request setBucket:theBucket];
return request;
}
-+ (id)requestWithBucket:(NSString *)bucket subResource:(NSString *)subResource
++ (id)requestWithBucket:(NSString *)theBucket subResource:(NSString *)theSubResource
{
ASIS3BucketRequest *request = [[[self alloc] initWithURL:nil] autorelease];
- [request setBucket:bucket];
- [request setSubResource:subResource];
+ [request setBucket:theBucket];
+ [request setSubResource:theSubResource];
return request;
}
-+ (id)PUTRequestWithBucket:(NSString *)bucket
++ (id)PUTRequestWithBucket:(NSString *)theBucket
{
- ASIS3BucketRequest *request = [self requestWithBucket:bucket];
+ ASIS3BucketRequest *request = [self requestWithBucket:theBucket];
[request setRequestMethod:@"PUT"];
return request;
}
-+ (id)DELETERequestWithBucket:(NSString *)bucket
++ (id)DELETERequestWithBucket:(NSString *)theBucket
{
- ASIS3BucketRequest *request = [self requestWithBucket:bucket];
+ ASIS3BucketRequest *request = [self requestWithBucket:theBucket];
[request setRequestMethod:@"DELETE"];
return request;
}
@@ -21,62 +21,62 @@ - (ASIHTTPRequest *)HEADRequest
return headRequest;
}
-+ (id)requestWithBucket:(NSString *)bucket key:(NSString *)key
++ (id)requestWithBucket:(NSString *)theBucket key:(NSString *)theKey
{
- ASIS3ObjectRequest *request = [[[self alloc] initWithURL:nil] autorelease];
- [request setBucket:bucket];
- [request setKey:key];
- return request;
+ ASIS3ObjectRequest *newRequest = [[[self alloc] initWithURL:nil] autorelease];
+ [newRequest setBucket:theBucket];
+ [newRequest setKey:theKey];
+ return newRequest;
}
-+ (id)requestWithBucket:(NSString *)bucket key:(NSString *)key subResource:(NSString *)subResource
++ (id)requestWithBucket:(NSString *)theBucket key:(NSString *)theKey subResource:(NSString *)theSubResource
{
- ASIS3ObjectRequest *request = [[[self alloc] initWithURL:nil] autorelease];
- [request setSubResource:subResource];
- [request setBucket:bucket];
- [request setKey:key];
- return request;
+ ASIS3ObjectRequest *newRequest = [[[self alloc] initWithURL:nil] autorelease];
+ [newRequest setSubResource:theSubResource];
+ [newRequest setBucket:theBucket];
+ [newRequest setKey:theKey];
+ return newRequest;
}
-+ (id)PUTRequestForData:(NSData *)data withBucket:(NSString *)bucket key:(NSString *)key
++ (id)PUTRequestForData:(NSData *)data withBucket:(NSString *)theBucket key:(NSString *)theKey
{
- ASIS3ObjectRequest *request = [self requestWithBucket:bucket key:key];
- [request appendPostData:data];
- [request setRequestMethod:@"PUT"];
- return request;
+ ASIS3ObjectRequest *newRequest = [self requestWithBucket:theBucket key:theKey];
+ [newRequest appendPostData:data];
+ [newRequest setRequestMethod:@"PUT"];
+ return newRequest;
}
-+ (id)PUTRequestForFile:(NSString *)filePath withBucket:(NSString *)bucket key:(NSString *)key
++ (id)PUTRequestForFile:(NSString *)filePath withBucket:(NSString *)theBucket key:(NSString *)theKey
{
- ASIS3ObjectRequest *request = [self requestWithBucket:bucket key:key];
- [request setPostBodyFilePath:filePath];
- [request setShouldStreamPostDataFromDisk:YES];
- [request setRequestMethod:@"PUT"];
- [request setMimeType:[ASIHTTPRequest mimeTypeForFileAtPath:filePath]];
- return request;
+ ASIS3ObjectRequest *newRequest = [self requestWithBucket:theBucket key:theKey];
+ [newRequest setPostBodyFilePath:filePath];
+ [newRequest setShouldStreamPostDataFromDisk:YES];
+ [newRequest setRequestMethod:@"PUT"];
+ [newRequest setMimeType:[ASIHTTPRequest mimeTypeForFileAtPath:filePath]];
+ return newRequest;
}
-+ (id)DELETERequestWithBucket:(NSString *)bucket key:(NSString *)key
++ (id)DELETERequestWithBucket:(NSString *)theBucket key:(NSString *)theKey
{
- ASIS3ObjectRequest *request = [self requestWithBucket:bucket key:key];
- [request setRequestMethod:@"DELETE"];
- return request;
+ ASIS3ObjectRequest *newRequest = [self requestWithBucket:theBucket key:theKey];
+ [newRequest setRequestMethod:@"DELETE"];
+ return newRequest;
}
-+ (id)COPYRequestFromBucket:(NSString *)sourceBucket key:(NSString *)sourceKey toBucket:(NSString *)bucket key:(NSString *)key
++ (id)COPYRequestFromBucket:(NSString *)theSourceBucket key:(NSString *)theSourceKey toBucket:(NSString *)theBucket key:(NSString *)theKey
{
- ASIS3ObjectRequest *request = [self requestWithBucket:bucket key:key];
- [request setRequestMethod:@"PUT"];
- [request setSourceBucket:sourceBucket];
- [request setSourceKey:sourceKey];
- return request;
+ ASIS3ObjectRequest *newRequest = [self requestWithBucket:theBucket key:theKey];
+ [newRequest setRequestMethod:@"PUT"];
+ [newRequest setSourceBucket:theSourceBucket];
+ [newRequest setSourceKey:theSourceKey];
+ return newRequest;
}
-+ (id)HEADRequestWithBucket:(NSString *)bucket key:(NSString *)key
++ (id)HEADRequestWithBucket:(NSString *)theBucket key:(NSString *)theKey
{
- ASIS3ObjectRequest *request = [self requestWithBucket:bucket key:key];
- [request setRequestMethod:@"HEAD"];
- return request;
+ ASIS3ObjectRequest *newRequest = [self requestWithBucket:theBucket key:theKey];
+ [newRequest setRequestMethod:@"HEAD"];
+ return newRequest;
}
- (id)copyWithZone:(NSZone *)zone

0 comments on commit ad37b62

Please sign in to comment.