[overview] Fix strict warnings.

derekzhang79 · Aug 17, 2012 · e409684 · e409684
1 parent 05211b0
commit e409684
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 28 deletions.
diff --git a/src/overview/src/NIDeviceInfo.m b/src/overview/src/NIDeviceInfo.m
@@ -41,7 +41,7 @@
 
   // Determine what magnitude the number of bytes is by shifting off 10 bits at a time
   // (equivalent to dividing by 1024).
-  NSInteger magnitude = 0;
+  unsigned long magnitude = 0;
   unsigned long long highbits = bytes;
   unsigned long long inverseBits = ~((unsigned long long)0x3FF);
   while ((highbits & inverseBits)

diff --git a/src/overview/src/NIOverview.m b/src/overview/src/NIOverview.m
@@ -75,8 +75,8 @@ void NIOverviewLogMethod(const char* message, unsigned length, BOOL withSyslogBa
   static NSDateFormatter* formatter = nil;
   if (nil == formatter) {
     formatter = [[NSDateFormatter alloc] init];
-    [formatter setTimeStyle:kCFDateFormatterMediumStyle];
-    [formatter setDateStyle:kCFDateFormatterMediumStyle];
+    [formatter setTimeStyle:NSDateFormatterMediumStyle];
+    [formatter setDateStyle:NSDateFormatterMediumStyle];
   }
 
   // Don't autorelease here in an attempt to minimize autorelease thrashing in tight

diff --git a/src/overview/src/NIOverviewMemoryCacheController.m b/src/overview/src/NIOverviewMemoryCacheController.m
@@ -28,6 +28,11 @@ @interface NIMemoryCache(Private)
 @property (nonatomic, readwrite, retain) NILinkedList* lruCacheObjects;
 @end
 
+// Anonymous private category for LRU cache objects.
+@interface NSObject(Private)
+- (NSDate *)lastAccessTime;
+@end
+
 @interface NIOverviewMemoryCacheController()
 @property (nonatomic, readonly, retain) NIMemoryCache* cache;
 @property (nonatomic, readwrite, retain) NITableViewModel* model;

diff --git a/src/overview/src/NIOverviewPageView.m b/src/overview/src/NIOverviewPageView.m
@@ -30,6 +30,10 @@
 static UIEdgeInsets kPagePadding;
 static const CGFloat kGraphRightMargin = 5;
 
+@interface NSObject (Private)
+- (id)initWithMemoryCache:(NIMemoryCache *)memoryCache;
+@end
+
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////

diff --git a/src/overview/src/NIOverviewSwizzling.m b/src/overview/src/NIOverviewSwizzling.m
@@ -27,10 +27,13 @@
 
 #ifdef DEBUG
 
-@interface UIApplication (NIDebugging)
-
+@interface UIApplication (Private)
 - (CGRect)_statusBarFrame;
+- (CGFloat)statusBarHeightForOrientation:(UIInterfaceOrientation)orientation;
+@end
 
+@interface UIViewController (Private)
+- (CGFloat)_statusBarHeightForCurrentInterfaceOrientation;
 @end
 
 CGFloat NIOverviewStatusBarHeight(void);
@@ -45,27 +48,6 @@ CGFloat NIOverviewStatusBarHeight(void) {
 }
 
 
-///////////////////////////////////////////////////////////////////////////////////////////////////
-void NIOverviewSwizzleMethods(void) {
-  NISwapInstanceMethods([UIViewController class],
-                        @selector(_statusBarHeightForCurrentInterfaceOrientation),
-                        @selector(__statusBarHeightForCurrentInterfaceOrientation));
-  NISwapInstanceMethods([UIApplication class],
-                        @selector(statusBarFrame),
-                        @selector(_statusBarFrame));
-  NISwapInstanceMethods([UIApplication class],
-                        @selector(statusBarHeightForOrientation:),
-                        @selector(_statusBarHeightForOrientation:));
-  NISwapInstanceMethods([UIApplication class],
-                        @selector(setStatusBarHidden:withAnimation:),
-                        @selector(_setStatusBarHidden:withAnimation:));
-  NISwapInstanceMethods([UIApplication class],
-                        @selector(setStatusBarStyle:animated:),
-                        @selector(_setStatusBarStyle:animated:));
-
-}
-
-
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -188,4 +170,23 @@ - (void)_setStatusBarStyle:(UIStatusBarStyle)statusBarStyle animated:(BOOL)anima
 @end
 
 
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void NIOverviewSwizzleMethods(void) {
+  NISwapInstanceMethods([UIViewController class],
+                        @selector(_statusBarHeightForCurrentInterfaceOrientation),
+                        @selector(__statusBarHeightForCurrentInterfaceOrientation));
+  NISwapInstanceMethods([UIApplication class],
+                        @selector(statusBarFrame),
+                        @selector(_statusBarFrame));
+  NISwapInstanceMethods([UIApplication class],
+                        @selector(statusBarHeightForOrientation:),
+                        @selector(_statusBarHeightForOrientation:));
+  NISwapInstanceMethods([UIApplication class],
+                        @selector(setStatusBarHidden:withAnimation:),
+                        @selector(_setStatusBarHidden:withAnimation:));
+  NISwapInstanceMethods([UIApplication class],
+                        @selector(setStatusBarStyle:animated:),
+                        @selector(_setStatusBarStyle:animated:));
+}
+
 #endif
diff --git a/src/overview/src/NIOverviewView.m b/src/overview/src/NIOverviewView.m
@@ -120,7 +120,7 @@ - (CGRect)frameForPageAtIndex:(NSInteger)pageIndex {
 - (void)layoutPages {
   _pagingScrollView.contentSize = [self contentSizeForPagingScrollView];
 
-  for (NSInteger ix = 0; ix < [_pageViews count]; ++ix) {
+  for (NSUInteger ix = 0; ix < [_pageViews count]; ++ix) {
     UIView* pageView = [_pageViews objectAtIndex:ix];
     pageView.frame = [self frameForPageAtIndex:ix];
   }
@@ -132,7 +132,7 @@ - (NSInteger)visiblePageIndex {
   CGFloat offset = _pagingScrollView.contentOffset.x;
   CGFloat pageWidth = _pagingScrollView.bounds.size.width;
 
-  return floorf(offset / pageWidth);
+  return (NSInteger)(offset / pageWidth);
 }