Removing unnecessary ivar declaration in headers

This commit is contained in:
Mattt Thompson 2012-04-08 15:25:20 -07:00
parent 2f94a89f80
commit 407374746c
8 changed files with 9 additions and 68 deletions

View file

@ -113,15 +113,7 @@ extern NSString * AFQueryStringFromParametersWithEncoding(NSDictionary *paramete
[NSURL URLWithString:@"http://example2.com/" relativeToURL:baseURL]; // http://example2.com/ [NSURL URLWithString:@"http://example2.com/" relativeToURL:baseURL]; // http://example2.com/
*/ */
@interface AFHTTPClient : NSObject { @interface AFHTTPClient : NSObject
@private
NSURL *_baseURL;
NSStringEncoding _stringEncoding;
AFHTTPClientParameterEncoding _parameterEncoding;
NSMutableArray *_registeredHTTPOperationClassNames;
NSMutableDictionary *_defaultHeaders;
NSOperationQueue *_operationQueue;
}
///--------------------------------------- ///---------------------------------------
/// @name Accessing HTTP Client Properties /// @name Accessing HTTP Client Properties

View file

@ -26,14 +26,7 @@
/** /**
`AFHTTPRequestOperation` is a subclass of `AFURLConnectionOperation` for requests using the HTTP or HTTPS protocols. It encapsulates the concept of acceptable status codes and content types, which determine the success or failure of a request. `AFHTTPRequestOperation` is a subclass of `AFURLConnectionOperation` for requests using the HTTP or HTTPS protocols. It encapsulates the concept of acceptable status codes and content types, which determine the success or failure of a request.
*/ */
@interface AFHTTPRequestOperation : AFURLConnectionOperation { @interface AFHTTPRequestOperation : AFURLConnectionOperation
@private
NSIndexSet *_acceptableStatusCodes;
NSSet *_acceptableContentTypes;
NSError *_HTTPError;
dispatch_queue_t _successCallbackQueue;
dispatch_queue_t _failureCallbackQueue;
}
///---------------------------------------------- ///----------------------------------------------
/// @name Getting HTTP URL Connection Information /// @name Getting HTTP URL Connection Information

View file

@ -49,15 +49,7 @@
- `image/x-xbitmap` - `image/x-xbitmap`
- `image/x-win-bitmap` - `image/x-win-bitmap`
*/ */
@interface AFImageRequestOperation : AFHTTPRequestOperation { @interface AFImageRequestOperation : AFHTTPRequestOperation
@private
#if __IPHONE_OS_VERSION_MIN_REQUIRED
UIImage *_responseImage;
CGFloat _imageScale;
#elif __MAC_OS_X_VERSION_MIN_REQUIRED
NSImage *_responseImage;
#endif
}
/** /**
An image constructed from the response data. If an error occurs during the request, `nil` will be returned, and the `error` property will be set to the error. An image constructed from the response data. If an error occurs during the request, `nil` will be returned, and the `error` property will be set to the error.

View file

@ -35,11 +35,7 @@
@warning JSON parsing will automatically use JSONKit, SBJSON, YAJL, or NextiveJSON, if provided. Otherwise, the built-in `NSJSONSerialization` class is used, if available (iOS 5.0 and Mac OS 10.7). If the build target does not either support `NSJSONSerialization` or include a third-party JSON library, a runtime exception will be thrown when attempting to parse a JSON request. @warning JSON parsing will automatically use JSONKit, SBJSON, YAJL, or NextiveJSON, if provided. Otherwise, the built-in `NSJSONSerialization` class is used, if available (iOS 5.0 and Mac OS 10.7). If the build target does not either support `NSJSONSerialization` or include a third-party JSON library, a runtime exception will be thrown when attempting to parse a JSON request.
*/ */
@interface AFJSONRequestOperation : AFHTTPRequestOperation { @interface AFJSONRequestOperation : AFHTTPRequestOperation
@private
id _responseJSON;
NSError *_JSONError;
}
///---------------------------- ///----------------------------
/// @name Getting Response Data /// @name Getting Response Data

View file

@ -32,13 +32,7 @@
- `application/x-plist` - `application/x-plist`
*/ */
@interface AFPropertyListRequestOperation : AFHTTPRequestOperation { @interface AFPropertyListRequestOperation : AFHTTPRequestOperation
@private
id _responsePropertyList;
NSPropertyListFormat _propertyListFormat;
NSPropertyListReadOptions _propertyListReadOptions;
NSError *_propertyListError;
}
///---------------------------- ///----------------------------
/// @name Getting Response Data /// @name Getting Response Data

View file

@ -75,24 +75,7 @@ extern NSString * const AFNetworkingOperationDidFinishNotification;
@warning Attempting to load a `file://` URL in iOS 4 may result in an `NSInvalidArgumentException`, caused by the connection returning `NSURLResponse` rather than `NSHTTPURLResponse`, which is the behavior as of iOS 5. @warning Attempting to load a `file://` URL in iOS 4 may result in an `NSInvalidArgumentException`, caused by the connection returning `NSURLResponse` rather than `NSHTTPURLResponse`, which is the behavior as of iOS 5.
*/ */
@interface AFURLConnectionOperation : NSOperation { @interface AFURLConnectionOperation : NSOperation
@private
unsigned short _state;
BOOL _cancelled;
NSRecursiveLock *_lock;
NSSet *_runLoopModes;
NSURLConnection *_connection;
NSURLRequest *_request;
NSHTTPURLResponse *_response;
NSError *_error;
NSData *_responseData;
NSInteger _totalBytesRead;
NSMutableData *_dataAccumulator;
NSOutputStream *_outputStream;
}
///------------------------------- ///-------------------------------
/// @name Accessing Run Loop Modes /// @name Accessing Run Loop Modes

View file

@ -85,6 +85,7 @@ static inline BOOL AFStateTransitionIsValid(AFOperationState fromState, AFOperat
@interface AFURLConnectionOperation () @interface AFURLConnectionOperation ()
@property (readwrite, nonatomic, assign) AFOperationState state; @property (readwrite, nonatomic, assign) AFOperationState state;
@property (readwrite, nonatomic, assign, getter = isCancelled) BOOL cancelled;
@property (readwrite, nonatomic, retain) NSRecursiveLock *lock; @property (readwrite, nonatomic, retain) NSRecursiveLock *lock;
@property (readwrite, nonatomic, retain) NSURLConnection *connection; @property (readwrite, nonatomic, retain) NSURLConnection *connection;
@property (readwrite, nonatomic, retain) NSURLRequest *request; @property (readwrite, nonatomic, retain) NSURLRequest *request;
@ -106,6 +107,7 @@ static inline BOOL AFStateTransitionIsValid(AFOperationState fromState, AFOperat
@implementation AFURLConnectionOperation @implementation AFURLConnectionOperation
@synthesize state = _state; @synthesize state = _state;
@synthesize cancelled = _cancelled;
@synthesize connection = _connection; @synthesize connection = _connection;
@synthesize runLoopModes = _runLoopModes; @synthesize runLoopModes = _runLoopModes;
@synthesize request = _request; @synthesize request = _request;
@ -304,10 +306,6 @@ static inline BOOL AFStateTransitionIsValid(AFOperationState fromState, AFOperat
return self.state == AFHTTPOperationFinishedState; return self.state == AFHTTPOperationFinishedState;
} }
- (BOOL)isCancelled {
return _cancelled;
}
- (BOOL)isConcurrent { - (BOOL)isConcurrent {
return YES; return YES;
} }

View file

@ -39,14 +39,7 @@
When `AFXMLRequestOperation` is registered with `AFHTTPClient`, the response object in the success callback of `HTTPRequestOperationWithRequest:success:failure:` will be an instance of `NSXMLParser`. On platforms that support `NSXMLDocument`, you have the option to ignore the response object, and simply use the `responseXMLDocument` property of the operation argument of the callback. When `AFXMLRequestOperation` is registered with `AFHTTPClient`, the response object in the success callback of `HTTPRequestOperationWithRequest:success:failure:` will be an instance of `NSXMLParser`. On platforms that support `NSXMLDocument`, you have the option to ignore the response object, and simply use the `responseXMLDocument` property of the operation argument of the callback.
*/ */
@interface AFXMLRequestOperation : AFHTTPRequestOperation { @interface AFXMLRequestOperation : AFHTTPRequestOperation
@private
NSXMLParser *_responseXMLParser;
#if __MAC_OS_X_VERSION_MIN_REQUIRED
NSXMLDocument *_responseXMLDocument;
#endif
NSError *_XMLError;
}
///---------------------------- ///----------------------------
/// @name Getting Response Data /// @name Getting Response Data