Namespaces that enum in ObjC

ChartsOrg · Apr 30, 2015 · c2f6d78 · c2f6d78
1 parent 382eb1f
commit c2f6d78
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Charts/Classes/Charts/CombinedChartView.swift b/Charts/Classes/Charts/CombinedChartView.swift
@@ -22,7 +22,7 @@ public class CombinedChartView: BarLineChartViewBase
 
     /// enum that allows to specify the order in which the different data objects for the combined-chart are drawn
     @objc
-    public enum DrawOrder: Int
+    public enum CombinedChartDrawOrder: Int
     {
         case Bar
         case Line
@@ -181,7 +181,7 @@ public class CombinedChartView: BarLineChartViewBase
         }
         set
         {
-            (renderer as! CombinedChartRenderer!).drawOrder = newValue.map { DrawOrder(rawValue: $0)! };
+            (renderer as! CombinedChartRenderer!).drawOrder = newValue.map { CombinedChartDrawOrder(rawValue: $0)! };
         }
     }
 }
diff --git a/Charts/Classes/Renderers/CombinedChartRenderer.swift b/Charts/Classes/Renderers/CombinedChartRenderer.swift
@@ -36,7 +36,7 @@ public class CombinedChartRenderer: ChartDataRendererBase,
 
     internal var _renderers = [ChartDataRendererBase]();
 
-    internal var _drawOrder: [CombinedChartView.DrawOrder] = [.Bar, .Line, .Candle, .Scatter];
+    internal var _drawOrder: [CombinedChartView.CombinedChartDrawOrder] = [.Bar, .Line, .Candle, .Scatter];
 
     public init(chart: CombinedChartView, animator: ChartAnimator, viewPortHandler: ChartViewPortHandler)
     {
@@ -330,7 +330,7 @@ public class CombinedChartRenderer: ChartDataRendererBase,
     /// the order in which the provided data objects should be drawn.
     /// The earlier you place them in the provided array, the further they will be in the background.
     /// e.g. if you provide [DrawOrder.Bar, DrawOrder.Line], the bars will be drawn behind the lines.
-    public var drawOrder: [CombinedChartView.DrawOrder]
+    public var drawOrder: [CombinedChartView.CombinedChartDrawOrder]
     {
         get
         {

diff --git a/ChartsDemo/Classes/Demos/CombinedChartViewController.m b/ChartsDemo/Classes/Demos/CombinedChartViewController.m
@@ -42,7 +42,7 @@ - (void)viewDidLoad
     _chartView.drawGridBackgroundEnabled = NO;
     _chartView.drawBarShadowEnabled = NO;
 
-    _chartView.drawOrder = @[@(DrawOrderBar), @(DrawOrderLine)];
+    _chartView.drawOrder = @[@(CombinedChartDrawOrderBar), @(CombinedChartDrawOrderLine)];
 
     ChartYAxis *rightAxis = _chartView.rightAxis;
     rightAxis.drawGridLinesEnabled = NO;