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>
Showing
5 changed files
with
52 additions
and
52 deletions
@@ -450,7 +450,7 @@ static const NSUInteger kDomainSection = 1; | @@ -450,7 +450,7 @@ static const NSUInteger kDomainSection = 1; | ||
450 | return cell; | 450 | return cell; |
451 | } | 451 | } |
452 | 452 | ||
453 | -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section | 453 | +- (NSInteger)tableView:(UITableView *)aTableView numberOfRowsInSection:(NSInteger)section |
454 | { | 454 | { |
455 | if (section == 0) { | 455 | if (section == 0) { |
456 | return 2; | 456 | return 2; |
@@ -11,11 +11,11 @@ | @@ -11,11 +11,11 @@ | ||
11 | 11 | ||
12 | @implementation ASIS3Bucket | 12 | @implementation ASIS3Bucket |
13 | 13 | ||
14 | -+ (id)bucketWithOwnerID:(NSString *)ownerID ownerName:(NSString *)ownerName | 14 | ++ (id)bucketWithOwnerID:(NSString *)anOwnerID ownerName:(NSString *)anOwnerName |
15 | { | 15 | { |
16 | ASIS3Bucket *bucket = [[[self alloc] init] autorelease]; | 16 | ASIS3Bucket *bucket = [[[self alloc] init] autorelease]; |
17 | - [bucket setOwnerID:ownerID]; | 17 | + [bucket setOwnerID:anOwnerID]; |
18 | - [bucket setOwnerName:ownerName]; | 18 | + [bucket setOwnerName:anOwnerName]; |
19 | return bucket; | 19 | return bucket; |
20 | } | 20 | } |
21 | 21 |
@@ -11,10 +11,10 @@ | @@ -11,10 +11,10 @@ | ||
11 | 11 | ||
12 | @implementation ASIS3BucketObject | 12 | @implementation ASIS3BucketObject |
13 | 13 | ||
14 | -+ (id)objectWithBucket:(NSString *)bucket | 14 | ++ (id)objectWithBucket:(NSString *)theBucket |
15 | { | 15 | { |
16 | ASIS3BucketObject *object = [[[self alloc] init] autorelease]; | 16 | ASIS3BucketObject *object = [[[self alloc] init] autorelease]; |
17 | - [object setBucket:bucket]; | 17 | + [object setBucket:theBucket]; |
18 | return object; | 18 | return object; |
19 | } | 19 | } |
20 | 20 |
@@ -28,32 +28,32 @@ | @@ -28,32 +28,32 @@ | ||
28 | return self; | 28 | return self; |
29 | } | 29 | } |
30 | 30 | ||
31 | -+ (id)requestWithBucket:(NSString *)bucket | 31 | ++ (id)requestWithBucket:(NSString *)theBucket |
32 | { | 32 | { |
33 | ASIS3BucketRequest *request = [[[self alloc] initWithURL:nil] autorelease]; | 33 | ASIS3BucketRequest *request = [[[self alloc] initWithURL:nil] autorelease]; |
34 | - [request setBucket:bucket]; | 34 | + [request setBucket:theBucket]; |
35 | return request; | 35 | return request; |
36 | } | 36 | } |
37 | 37 | ||
38 | -+ (id)requestWithBucket:(NSString *)bucket subResource:(NSString *)subResource | 38 | ++ (id)requestWithBucket:(NSString *)theBucket subResource:(NSString *)theSubResource |
39 | { | 39 | { |
40 | ASIS3BucketRequest *request = [[[self alloc] initWithURL:nil] autorelease]; | 40 | ASIS3BucketRequest *request = [[[self alloc] initWithURL:nil] autorelease]; |
41 | - [request setBucket:bucket]; | 41 | + [request setBucket:theBucket]; |
42 | - [request setSubResource:subResource]; | 42 | + [request setSubResource:theSubResource]; |
43 | return request; | 43 | return request; |
44 | } | 44 | } |
45 | 45 | ||
46 | -+ (id)PUTRequestWithBucket:(NSString *)bucket | 46 | ++ (id)PUTRequestWithBucket:(NSString *)theBucket |
47 | { | 47 | { |
48 | - ASIS3BucketRequest *request = [self requestWithBucket:bucket]; | 48 | + ASIS3BucketRequest *request = [self requestWithBucket:theBucket]; |
49 | [request setRequestMethod:@"PUT"]; | 49 | [request setRequestMethod:@"PUT"]; |
50 | return request; | 50 | return request; |
51 | } | 51 | } |
52 | 52 | ||
53 | 53 | ||
54 | -+ (id)DELETERequestWithBucket:(NSString *)bucket | 54 | ++ (id)DELETERequestWithBucket:(NSString *)theBucket |
55 | { | 55 | { |
56 | - ASIS3BucketRequest *request = [self requestWithBucket:bucket]; | 56 | + ASIS3BucketRequest *request = [self requestWithBucket:theBucket]; |
57 | [request setRequestMethod:@"DELETE"]; | 57 | [request setRequestMethod:@"DELETE"]; |
58 | return request; | 58 | return request; |
59 | } | 59 | } |
@@ -21,62 +21,62 @@ NSString *const ASIS3StorageClassReducedRedundancy = @"REDUCED_REDUNDANCY"; | @@ -21,62 +21,62 @@ NSString *const ASIS3StorageClassReducedRedundancy = @"REDUCED_REDUNDANCY"; | ||
21 | return headRequest; | 21 | return headRequest; |
22 | } | 22 | } |
23 | 23 | ||
24 | -+ (id)requestWithBucket:(NSString *)bucket key:(NSString *)key | 24 | ++ (id)requestWithBucket:(NSString *)theBucket key:(NSString *)theKey |
25 | { | 25 | { |
26 | - ASIS3ObjectRequest *request = [[[self alloc] initWithURL:nil] autorelease]; | 26 | + ASIS3ObjectRequest *newRequest = [[[self alloc] initWithURL:nil] autorelease]; |
27 | - [request setBucket:bucket]; | 27 | + [newRequest setBucket:theBucket]; |
28 | - [request setKey:key]; | 28 | + [newRequest setKey:theKey]; |
29 | - return request; | 29 | + return newRequest; |
30 | } | 30 | } |
31 | 31 | ||
32 | -+ (id)requestWithBucket:(NSString *)bucket key:(NSString *)key subResource:(NSString *)subResource | 32 | ++ (id)requestWithBucket:(NSString *)theBucket key:(NSString *)theKey subResource:(NSString *)theSubResource |
33 | { | 33 | { |
34 | - ASIS3ObjectRequest *request = [[[self alloc] initWithURL:nil] autorelease]; | 34 | + ASIS3ObjectRequest *newRequest = [[[self alloc] initWithURL:nil] autorelease]; |
35 | - [request setSubResource:subResource]; | 35 | + [newRequest setSubResource:theSubResource]; |
36 | - [request setBucket:bucket]; | 36 | + [newRequest setBucket:theBucket]; |
37 | - [request setKey:key]; | 37 | + [newRequest setKey:theKey]; |
38 | - return request; | 38 | + return newRequest; |
39 | } | 39 | } |
40 | 40 | ||
41 | -+ (id)PUTRequestForData:(NSData *)data withBucket:(NSString *)bucket key:(NSString *)key | 41 | ++ (id)PUTRequestForData:(NSData *)data withBucket:(NSString *)theBucket key:(NSString *)theKey |
42 | { | 42 | { |
43 | - ASIS3ObjectRequest *request = [self requestWithBucket:bucket key:key]; | 43 | + ASIS3ObjectRequest *newRequest = [self requestWithBucket:theBucket key:theKey]; |
44 | - [request appendPostData:data]; | 44 | + [newRequest appendPostData:data]; |
45 | - [request setRequestMethod:@"PUT"]; | 45 | + [newRequest setRequestMethod:@"PUT"]; |
46 | - return request; | 46 | + return newRequest; |
47 | } | 47 | } |
48 | 48 | ||
49 | -+ (id)PUTRequestForFile:(NSString *)filePath withBucket:(NSString *)bucket key:(NSString *)key | 49 | ++ (id)PUTRequestForFile:(NSString *)filePath withBucket:(NSString *)theBucket key:(NSString *)theKey |
50 | { | 50 | { |
51 | - ASIS3ObjectRequest *request = [self requestWithBucket:bucket key:key]; | 51 | + ASIS3ObjectRequest *newRequest = [self requestWithBucket:theBucket key:theKey]; |
52 | - [request setPostBodyFilePath:filePath]; | 52 | + [newRequest setPostBodyFilePath:filePath]; |
53 | - [request setShouldStreamPostDataFromDisk:YES]; | 53 | + [newRequest setShouldStreamPostDataFromDisk:YES]; |
54 | - [request setRequestMethod:@"PUT"]; | 54 | + [newRequest setRequestMethod:@"PUT"]; |
55 | - [request setMimeType:[ASIHTTPRequest mimeTypeForFileAtPath:filePath]]; | 55 | + [newRequest setMimeType:[ASIHTTPRequest mimeTypeForFileAtPath:filePath]]; |
56 | - return request; | 56 | + return newRequest; |
57 | } | 57 | } |
58 | 58 | ||
59 | -+ (id)DELETERequestWithBucket:(NSString *)bucket key:(NSString *)key | 59 | ++ (id)DELETERequestWithBucket:(NSString *)theBucket key:(NSString *)theKey |
60 | { | 60 | { |
61 | - ASIS3ObjectRequest *request = [self requestWithBucket:bucket key:key]; | 61 | + ASIS3ObjectRequest *newRequest = [self requestWithBucket:theBucket key:theKey]; |
62 | - [request setRequestMethod:@"DELETE"]; | 62 | + [newRequest setRequestMethod:@"DELETE"]; |
63 | - return request; | 63 | + return newRequest; |
64 | } | 64 | } |
65 | 65 | ||
66 | -+ (id)COPYRequestFromBucket:(NSString *)sourceBucket key:(NSString *)sourceKey toBucket:(NSString *)bucket key:(NSString *)key | 66 | ++ (id)COPYRequestFromBucket:(NSString *)theSourceBucket key:(NSString *)theSourceKey toBucket:(NSString *)theBucket key:(NSString *)theKey |
67 | { | 67 | { |
68 | - ASIS3ObjectRequest *request = [self requestWithBucket:bucket key:key]; | 68 | + ASIS3ObjectRequest *newRequest = [self requestWithBucket:theBucket key:theKey]; |
69 | - [request setRequestMethod:@"PUT"]; | 69 | + [newRequest setRequestMethod:@"PUT"]; |
70 | - [request setSourceBucket:sourceBucket]; | 70 | + [newRequest setSourceBucket:theSourceBucket]; |
71 | - [request setSourceKey:sourceKey]; | 71 | + [newRequest setSourceKey:theSourceKey]; |
72 | - return request; | 72 | + return newRequest; |
73 | } | 73 | } |
74 | 74 | ||
75 | -+ (id)HEADRequestWithBucket:(NSString *)bucket key:(NSString *)key | 75 | ++ (id)HEADRequestWithBucket:(NSString *)theBucket key:(NSString *)theKey |
76 | { | 76 | { |
77 | - ASIS3ObjectRequest *request = [self requestWithBucket:bucket key:key]; | 77 | + ASIS3ObjectRequest *newRequest = [self requestWithBucket:theBucket key:theKey]; |
78 | - [request setRequestMethod:@"HEAD"]; | 78 | + [newRequest setRequestMethod:@"HEAD"]; |
79 | - return request; | 79 | + return newRequest; |
80 | } | 80 | } |
81 | 81 | ||
82 | - (id)copyWithZone:(NSZone *)zone | 82 | - (id)copyWithZone:(NSZone *)zone |
-
Please register or login to post a comment