Merge pull request #1379 from liuxuan30/Swift-3.0

fix bridgedObjCGetStringArray warning and more copyWithZone(_ zone: NSZone?) -> AnyObject errors
ChartsOrg · Aug 31, 2016 · ce4e180 · ce4e180
2 parents 1b22f8d + 3bb6931
commit ce4e180
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/Charts/Classes/Utils/ChartUtils.swift b/Charts/Classes/Utils/ChartUtils.swift
@@ -394,7 +394,7 @@ open class ChartUtils
             }
             else
             {
-                newArray.append(val as! NSObject)
+                newArray.append(val! as NSObject)
             }
         }
         return newArray

diff --git a/ChartsRealm/Classes/Data/RealmBarDataSet.swift b/ChartsRealm/Classes/Data/RealmBarDataSet.swift
@@ -247,7 +247,7 @@ open class RealmBarDataSet: RealmBarLineScatterCandleBubbleDataSet, IBarChartDat
 
     // MARK: - NSCopying
 
-    open override func copyWithZone(_ zone: NSZone?) -> AnyObject
+    open override func copyWithZone(_ zone: NSZone?) -> Any
     {
         let copy = super.copyWithZone(zone) as! RealmBarDataSet
         copy._stackSize = _stackSize

diff --git a/ChartsRealm/Classes/Data/RealmBubbleDataSet.swift b/ChartsRealm/Classes/Data/RealmBubbleDataSet.swift
@@ -174,7 +174,7 @@ open class RealmBubbleDataSet: RealmBarLineScatterCandleBubbleDataSet, IBubbleCh
 
     // MARK: - NSCopying
 
-    open override func copyWithZone(_ zone: NSZone?) -> AnyObject
+    open override func copyWithZone(_ zone: NSZone?) -> Any
     {
         let copy = super.copyWithZone(zone) as! RealmBubbleDataSet
         copy._xMin = _xMin

diff --git a/ChartsRealm/Classes/Data/RealmLineDataSet.swift b/ChartsRealm/Classes/Data/RealmLineDataSet.swift
@@ -177,7 +177,7 @@ open class RealmLineDataSet: RealmLineRadarDataSet, ILineChartDataSet
 
     // MARK: NSCopying
 
-    open override func copyWithZone(_ zone: NSZone?) -> AnyObject
+    open override func copyWithZone(_ zone: NSZone?) -> Any
     {
         let copy = super.copyWithZone(zone) as! RealmLineDataSet
         copy.circleRadius = circleRadius

diff --git a/ChartsRealm/Classes/Data/RealmLineRadarDataSet.swift b/ChartsRealm/Classes/Data/RealmLineRadarDataSet.swift
@@ -84,7 +84,7 @@ open class RealmLineRadarDataSet: RealmLineScatterCandleRadarDataSet, ILineRadar
 
     // MARK: NSCopying
 
-    open override func copyWithZone(_ zone: NSZone?) -> AnyObject
+    open override func copyWithZone(_ zone: NSZone?) -> Any
     {
         let copy = super.copyWithZone(zone) as! RealmLineRadarDataSet
         copy.fillColor = fillColor

diff --git a/ChartsRealm/Classes/Data/RealmLineScatterCandleRadarDataSet.swift b/ChartsRealm/Classes/Data/RealmLineScatterCandleRadarDataSet.swift
@@ -46,7 +46,7 @@ open class RealmLineScatterCandleRadarDataSet: RealmBarLineScatterCandleBubbleDa
 
     // MARK: NSCopying
 
-    open override func copyWithZone(_ zone: NSZone?) -> AnyObject
+    open override func copyWithZone(_ zone: NSZone?) -> Any
     {
         let copy = super.copyWithZone(zone) as! RealmLineScatterCandleRadarDataSet
         copy.drawHorizontalHighlightIndicatorEnabled = drawHorizontalHighlightIndicatorEnabled

diff --git a/ChartsRealm/Classes/Data/RealmScatterDataSet.swift b/ChartsRealm/Classes/Data/RealmScatterDataSet.swift
@@ -47,7 +47,7 @@ open class RealmScatterDataSet: RealmLineScatterCandleRadarDataSet, IScatterChar
 
     // MARK: NSCopying
 
-    open override func copyWithZone(_ zone: NSZone?) -> AnyObject
+    open override func copyWithZone(_ zone: NSZone?) -> Any
     {
         let copy = super.copyWithZone(zone) as! RealmScatterDataSet
         copy.scatterShapeSize = scatterShapeSize
-Original file line number
+Diff line change
@@ Expand Up / @@ -394,7 +394,7 @@ open class ChartUtils @@
                 }
                 else
                 {
-                    newArray.append(val as! NSObject)
+                    newArray.append(val! as NSObject)
                 }
             }
             return newArray
@@ Expand Down @@