Fix compiling issue related to UIDeviceOrientation

card-io · Aug 25, 2015 · 9f86d45 · 9f86d45
1 parent f0e37bc
commit 9f86d45
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/Classes/CardIOCameraView.mm b/Classes/CardIOCameraView.mm
@@ -540,13 +540,13 @@ - (UIInterfaceOrientation)defaultSupportedOverlayOrientation {
     return UIInterfaceOrientationPortrait;
   }
   else {
-    UIInterfaceOrientation defaultOrientation = UIDeviceOrientationUnknown;
+    UIInterfaceOrientation defaultOrientation = UIInterfaceOrientationUnknown;
     UIInterfaceOrientationMask supportedOverlayOrientationsMask = [self supportedOverlayOrientationsMask];
-    for (UIInterfaceOrientationMask orientation = UIInterfaceOrientationPortrait;
+    for (NSInteger orientation = UIInterfaceOrientationPortrait;
          orientation <= UIInterfaceOrientationLandscapeRight;
          orientation++) {
       if ((supportedOverlayOrientationsMask & (1 << orientation)) != 0) {
-        defaultOrientation = orientation;
+        defaultOrientation = (UIInterfaceOrientation)orientation;
         break;
       }
     }

diff --git a/Classes/CardIOView.mm b/Classes/CardIOView.mm
@@ -261,7 +261,7 @@ - (void)successfulScan:(CardIOCreditCardInfo *)cardInfo {
     if (deviceOrientation == UIDeviceOrientationFaceUp || deviceOrientation == UIDeviceOrientationFaceDown) {
       deviceOrientation = (UIDeviceOrientation) vc.initialInterfaceOrientationForViewcontroller;
     }
-    InterfaceToDeviceOrientationDelta delta = orientationDelta(UIDeviceOrientationPortrait, deviceOrientation);
+    InterfaceToDeviceOrientationDelta delta = orientationDelta(UIInterfaceOrientationPortrait, deviceOrientation);
     CGFloat rotation = -rotationForOrientationDelta(delta); // undo the orientation delta
     r = CGAffineTransformMakeRotation(rotation);
   }

diff --git a/Classes/CardIOViewController.mm b/Classes/CardIOViewController.mm
@@ -390,13 +390,13 @@ - (UIInterfaceOrientation)defaultSupportedOverlayOrientation {
     return UIInterfaceOrientationPortrait;
   }
   else {
-    UIInterfaceOrientation defaultOrientation = UIDeviceOrientationUnknown;
+    UIInterfaceOrientation defaultOrientation = UIInterfaceOrientationUnknown;
     UIInterfaceOrientationMask supportedOverlayOrientationsMask = [self supportedOverlayOrientationsMask];
-    for (UIInterfaceOrientationMask orientation = UIInterfaceOrientationPortrait;
+    for (NSInteger orientation = UIInterfaceOrientationMaskPortrait;
          orientation <= UIInterfaceOrientationLandscapeRight;
          orientation++) {
       if ((supportedOverlayOrientationsMask & (1 << orientation)) != 0) {
-        defaultOrientation = orientation;
+        defaultOrientation = (UIInterfaceOrientation)orientation;
         break;
       }
     }
@@ -416,7 +416,7 @@ - (BOOL)prefersStatusBarHidden {
 }
 
 - (UIStatusBarStyle) preferredStatusBarStyle {
-  return /*UIStatusBarStyleLightContent*/1;
+  return UIStatusBarStyleLightContent;
 }
 
 #pragma mark - Handle button taps
@@ -429,7 +429,7 @@ - (void)manualEntry:(id)sender {
   CardIODataEntryViewController *manualEntryViewController = [[CardIODataEntryViewController alloc] initWithContext:self.context withStatusBarHidden:self.statusBarWasOriginallyHidden];
   manualEntryViewController.manualEntry = YES;
   root.currentViewControllerIsDataEntry = YES;
-  root.initialInterfaceOrientationForViewcontroller = (UIDeviceOrientation)self.deviceOrientation;
+  root.initialInterfaceOrientationForViewcontroller = (UIInterfaceOrientation)self.deviceOrientation;
 
   if (iOS_8_PLUS) {
     // The presentViewController:/dismissViewControllerAnimated: kludge was necessary for
@@ -539,7 +539,7 @@ - (void)cardIOView:(CardIOView *)cardIOView didScanCard:(CardIOCreditCardInfo *)
 
     CardIOPaymentViewController *root = (CardIOPaymentViewController *)self.navigationController;
     root.currentViewControllerIsDataEntry = YES;
-    root.initialInterfaceOrientationForViewcontroller = (UIDeviceOrientation)self.deviceOrientation;
+    root.initialInterfaceOrientationForViewcontroller = (UIInterfaceOrientation)self.deviceOrientation;
 
     if (iOS_8_PLUS) {
       // The presentViewController:/dismissViewControllerAnimated: kludge was necessary for