Merge pull request samvermette#127 from hborders/typesafe_enum_and_an…

…alyzer Use new typesafe enum macro. Run analyzer.
RonaldAndersonAol · Sep 26, 2013 · 98a713c · 98a713c
2 parents 28691b7 + a0d347e
commit 98a713c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/Demo/SVPullToRefreshDemo.xcodeproj/project.pbxproj b/Demo/SVPullToRefreshDemo.xcodeproj/project.pbxproj
@@ -255,6 +255,7 @@
  GCC_WARN_UNINITIALIZED_AUTOS = YES;
  GCC_WARN_UNUSED_VARIABLE = YES;
  IPHONEOS_DEPLOYMENT_TARGET = 5.1;
+ RUN_CLANG_STATIC_ANALYZER = YES;
  SDKROOT = iphoneos;
  };
  name = Debug;
@@ -278,6 +279,7 @@
  GCC_WARN_UNUSED_VARIABLE = YES;
  IPHONEOS_DEPLOYMENT_TARGET = 5.1;
  OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
+ RUN_CLANG_STATIC_ANALYZER = YES;
  SDKROOT = iphoneos;
  VALIDATE_PRODUCT = YES;
  };

diff --git a/SVPullToRefresh/UIScrollView+SVPullToRefresh.h b/SVPullToRefresh/UIScrollView+SVPullToRefresh.h
@@ -15,13 +15,11 @@
 
 @interface UIScrollView (SVPullToRefresh)
 
-enum {
+typedef NS_ENUM(NSUInteger, SVPullToRefreshPosition) {
  SVPullToRefreshPositionTop = 0,
  SVPullToRefreshPositionBottom,
 };
 
-typedef NSUInteger SVPullToRefreshPosition;
-
 - (void)addPullToRefreshWithActionHandler:(void (^)(void))actionHandler;
 - (void)addPullToRefreshWithActionHandler:(void (^)(void))actionHandler position:(SVPullToRefreshPosition)position;
 - (void)triggerPullToRefresh;
@@ -32,15 +30,13 @@ typedef NSUInteger SVPullToRefreshPosition;
 @end
 
 
-enum {
+typedef NS_ENUM(NSUInteger, SVPullToRefreshState) {
  SVPullToRefreshStateStopped = 0,
  SVPullToRefreshStateTriggered,
  SVPullToRefreshStateLoading,
  SVPullToRefreshStateAll = 10
 };
 
-typedef NSUInteger SVPullToRefreshState;
-
 @interface SVPullToRefreshView : UIView
 
 @property (nonatomic, strong) UIColor *arrowColor;

diff --git a/SVPullToRefresh/UIScrollView+SVPullToRefresh.m b/SVPullToRefresh/UIScrollView+SVPullToRefresh.m
@@ -231,6 +231,7 @@ - (void)layoutSubviews {
  }
  else {
  switch (self.state) {
+ case SVPullToRefreshStateAll:
  case SVPullToRefreshStateStopped:
  self.arrow.alpha = 1;
  [self.activityIndicatorView stopAnimating];
@@ -640,6 +641,7 @@ - (void)setState:(SVPullToRefreshState)newState {
  [self layoutIfNeeded];
 
  switch (newState) {
+ case SVPullToRefreshStateAll:
  case SVPullToRefreshStateStopped:
  [self resetScrollViewContentInset];
  break;