Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

OFHTTPRequestFailedException: Naming consistency

  • Loading branch information...
commit 4c173cc6f785df0135ae00e639e3301789f75cd1 1 parent 1bdb439
@Midar authored
View
2  src/OFDataArray.m
@@ -153,7 +153,7 @@ @implementation OFDataArray
if ([result statusCode] != 200)
@throw [OFHTTPRequestFailedException
exceptionWithClass: [request class]
- HTTPRequest: request
+ request: request
result: result];
self = [[result data] retain];
View
2  src/OFHTTPRequest.m
@@ -523,7 +523,7 @@ - (OFHTTPRequestResult*)performWithRedirects: (size_t)redirects
[result autorelease];
@throw [OFHTTPRequestFailedException
exceptionWithClass: [self class]
- HTTPRequest: self
+ request: self
result: result];
}
View
2  src/OFString.m
@@ -914,7 +914,7 @@ + (void)initialize
if ([result statusCode] != 200)
@throw [OFHTTPRequestFailedException
exceptionWithClass: [request class]
- HTTPRequest: request
+ request: request
result: result];
if (encoding == OF_STRING_ENCODING_AUTODETECT &&
View
10 src/exceptions/OFHTTPRequestFailedException.h
@@ -24,12 +24,12 @@
*/
@interface OFHTTPRequestFailedException: OFException
{
- OFHTTPRequest *HTTPRequest;
+ OFHTTPRequest *request;
OFHTTPRequestResult *result;
}
#ifdef OF_HAVE_PROPERTIES
-@property (readonly, retain, nonatomic) OFHTTPRequest *HTTPRequest;
+@property (readonly, retain, nonatomic) OFHTTPRequest *request;
@property (readonly, retain, nonatomic) OFHTTPRequestResult *result;
#endif
@@ -40,7 +40,7 @@
* \return A new HTTP request failed exception
*/
+ exceptionWithClass: (Class)class_
- HTTPRequest: (OFHTTPRequest*)request
+ request: (OFHTTPRequest*)request
result: (OFHTTPRequestResult*)result;
/**
@@ -52,13 +52,13 @@
* \return A new HTTP request failed exception
*/
- initWithClass: (Class)class_
- HTTPRequest: (OFHTTPRequest*)request
+ request: (OFHTTPRequest*)request
result: (OFHTTPRequestResult*)result;
/**
* \return The HTTP request which failed
*/
-- (OFHTTPRequest*)HTTPRequest;
+- (OFHTTPRequest*)request;
/**
* \return The result of the failed HTTP request
View
18 src/exceptions/OFHTTPRequestFailedException.m
@@ -26,11 +26,11 @@
@implementation OFHTTPRequestFailedException
+ exceptionWithClass: (Class)class_
- HTTPRequest: (OFHTTPRequest*)request
+ request: (OFHTTPRequest*)request
result: (OFHTTPRequestResult*)result
{
return [[[self alloc] initWithClass: class_
- HTTPRequest: request
+ request: request
result: result] autorelease];
}
@@ -43,12 +43,12 @@ @implementation OFHTTPRequestFailedException
}
- initWithClass: (Class)class_
- HTTPRequest: (OFHTTPRequest*)request
+ request: (OFHTTPRequest*)request_
result: (OFHTTPRequestResult*)result_
{
self = [super initWithClass: class_];
- HTTPRequest = [request retain];
+ request = [request_ retain];
result = [result_ retain];
return self;
@@ -56,7 +56,7 @@ @implementation OFHTTPRequestFailedException
- (void)dealloc
{
- [HTTPRequest release];
+ [request release];
[result release];
[super dealloc];
@@ -70,7 +70,7 @@ - (OFString*)description
if (description != nil)
return description;
- switch ([HTTPRequest requestType]) {
+ switch ([request requestType]) {
case OF_HTTP_REQUEST_TYPE_GET:
type = "GET";
break;
@@ -86,16 +86,16 @@ - (OFString*)description
description = [[OFString alloc] initWithFormat:
@"A HTTP %s request in class %@ with URL %@ failed with code %d",
- type, inClass, [HTTPRequest URL], [result statusCode]];
+ type, inClass, [request URL], [result statusCode]];
objc_autoreleasePoolPop(pool);
return description;
}
-- (OFHTTPRequest*)HTTPRequest
+- (OFHTTPRequest*)request
{
- OF_GETTER(HTTPRequest, NO)
+ OF_GETTER(request, NO)
}
- (OFHTTPRequestResult*)result
Please sign in to comment.
Something went wrong with that request. Please try again.