From ae1d419cd403d6d888d939dde1057b56981a1f40 Mon Sep 17 00:00:00 2001 From: Mattt Thompson Date: Tue, 9 Oct 2012 09:46:30 -0700 Subject: [PATCH] Using NS_ENUM in place of typedef enum --- AFNetworking/AFHTTPClient.h | 8 ++++---- AFNetworking/AFHTTPClient.m | 4 ++-- AFNetworking/AFURLConnectionOperation.m | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/AFNetworking/AFHTTPClient.h b/AFNetworking/AFHTTPClient.h index bb631c5..1ff60a9 100755 --- a/AFNetworking/AFHTTPClient.h +++ b/AFNetworking/AFHTTPClient.h @@ -72,12 +72,12 @@ */ #ifdef _SYSTEMCONFIGURATION_H -typedef enum { +typedef NS_ENUM(NSInteger, AFNetworkReachabilityStatus) { AFNetworkReachabilityStatusUnknown = -1, AFNetworkReachabilityStatusNotReachable = 0, AFNetworkReachabilityStatusReachableViaWWAN = 1, AFNetworkReachabilityStatusReachableViaWiFi = 2, -} AFNetworkReachabilityStatus; +}; #else #warning "SystemConfiguration framework not found in project, or not included in precompiled header. Network reachability functionality will not be available." #endif @@ -86,11 +86,11 @@ typedef enum { #warning "CoreServices framework not found in project, or not included in precompiled header. Automatic MIME type detection when uploading files in multipart requests will not be available." #endif -typedef enum { +typedef NS_ENUM(NSInteger, AFHTTPClientParameterEncoding) { AFFormURLParameterEncoding, AFJSONParameterEncoding, AFPropertyListParameterEncoding, -} AFHTTPClientParameterEncoding; +}; @class AFHTTPRequestOperation; @protocol AFMultipartFormData; diff --git a/AFNetworking/AFHTTPClient.m b/AFNetworking/AFHTTPClient.m index 9caeaf4..b642ee8 100755 --- a/AFNetworking/AFHTTPClient.m +++ b/AFNetworking/AFHTTPClient.m @@ -1036,12 +1036,12 @@ NSTimeInterval const kAFUploadStream3GSuggestedDelay = 0.2; #pragma mark - -typedef enum { +typedef NS_ENUM(NSInteger, AFHTTPBodyPartReadPhase) { AFEncapsulationBoundaryPhase = 1, AFHeaderPhase = 2, AFBodyPhase = 3, AFFinalBoundaryPhase = 4, -} AFHTTPBodyPartReadPhase; +}; @interface AFHTTPBodyPart () { AFHTTPBodyPartReadPhase _phase; diff --git a/AFNetworking/AFURLConnectionOperation.m b/AFNetworking/AFURLConnectionOperation.m index 9f502f5..4ccbc80 100644 --- a/AFNetworking/AFURLConnectionOperation.m +++ b/AFNetworking/AFURLConnectionOperation.m @@ -30,12 +30,12 @@ // You can turn on ARC for only AFNetworking files by adding -fobjc-arc to the build phase for each of its files. #endif -typedef enum { +typedef NS_ENUM(NSInteger, _AFOperationState) { AFOperationPausedState = -1, AFOperationReadyState = 1, AFOperationExecutingState = 2, AFOperationFinishedState = 3, -} _AFOperationState; +}; typedef signed short AFOperationState;