Updated latest commits to Swift 2.0

Charts/Classes/Charts/ChartViewBase.swift

@@ -451,7 +451,6 @@ public class ChartViewBase: UIView, ChartAnimatorDelegate
         {
             let highlight = _indicesToHightlight[i]
             let xIndex = highlight.xIndex
-            let dataSetIndex = highlight.dataSetIndex
 
             if (xIndex <= Int(_deltaX) && xIndex <= Int(_deltaX * _animator.phaseX))
             {
@@ -830,7 +829,7 @@ public class ChartViewBase: UIView, ChartAnimatorDelegate
     internal typealias VoidClosureType = () -> ()
     internal var _sizeChangeEventActions = [VoidClosureType]()
 
-    public override func observeValueForKeyPath(keyPath: String?, ofObject object: AnyObject?, change: [NSObject : AnyObject]?, context: UnsafeMutablePointer<Void>)
+    public override func observeValueForKeyPath(keyPath: String?, ofObject object: AnyObject?, change: [String : AnyObject]?, context: UnsafeMutablePointer<Void>)
     {
         if (keyPath == "bounds" || keyPath == "frame")
         {

Charts/Classes/Components/ChartMarker.swift

@@ -51,7 +51,7 @@ public class ChartMarker: ChartComponentBase
 
     /// This method enables a custom ChartMarker to update it's content everytime the MarkerView is redrawn according to the data entry it points to.
     ///
-    /// :param: highlight the highlight object contains information about the highlighted value such as it's dataset-index, the selected range or stack-index (only stacked bar entries).
+    /// - parameter highlight: the highlight object contains information about the highlighted value such as it's dataset-index, the selected range or stack-index (only stacked bar entries).
     public func refreshContent(entry entry: ChartDataEntry, highlight: ChartHighlight)
     {
         // Do nothing here...

Charts/Classes/Components/ChartYAxis.swift

@@ -237,7 +237,7 @@ public class ChartYAxis: ChartAxisBase
 
     public var isStartAtZeroEnabled: Bool { return startAtZeroEnabled; }
 
-    /// :returns: true if focing the y-label count is enabled. Default: false
+    /// - returns: true if focing the y-label count is enabled. Default: false
     public var isForceLabelsEnabled: Bool { return forceLabelsEnabled }
 
     public var isShowOnlyMinMaxEnabled: Bool { return showOnlyMinMaxEnabled; }

Charts/Classes/Data/BarChartDataEntry.swift

@@ -70,13 +70,13 @@ public class BarChartDataEntry: ChartDataEntry
         return remainder
     }
 
-    /// :returns: the sum of all negative values this entry (if stacked) contains. (this is a positive number)
+    /// - returns: the sum of all negative values this entry (if stacked) contains. (this is a positive number)
     public var negativeSum: Double
     {
         return _negativeSum
     }
 
-    /// :returns: the sum of all positive values this entry (if stacked) contains.
+    /// - returns: the sum of all positive values this entry (if stacked) contains.
     public var positiveSum: Double
     {
         return _positiveSum
@@ -140,8 +140,8 @@ public class BarChartDataEntry: ChartDataEntry
 
     /// Calculates the sum across all values of the given stack.
     ///
-    /// :param: vals
-    /// :returns:
+    /// - parameter vals:
+    /// - returns:
     private static func calcSum(vals: [Double]?) -> Double
     {
         if vals == nil

Charts/Classes/Data/BarChartDataSet.swift

@@ -96,7 +96,7 @@ public class BarChartDataSet: BarLineScatterCandleChartDataSet
     }
     }
 
-    internal override func calcMinMax(#start : Int, end: Int)
+    internal override func calcMinMax(start start : Int, end: Int)
     {
         let yValCount = _yVals.count
 

Charts/Classes/Highlight/BarChartHighlighter.swift

@@ -22,9 +22,9 @@ internal class BarChartHighlighter: ChartHighlighter
         super.init(chart: chart)
     }
 
-    internal override func getHighlight(#x: Double, y: Double) -> ChartHighlight?
+    internal override func getHighlight(x x: Double, y: Double) -> ChartHighlight?
     {
-        var h = super.getHighlight(x: x, y: y)
+        let h = super.getHighlight(x: x, y: y)
 
         if h === nil
         {
@@ -86,7 +86,7 @@ internal class BarChartHighlighter: ChartHighlighter
         }
     }
 
-    internal override func getDataSetIndex(#xIndex: Int, x: Double, y: Double) -> Int
+    internal override func getDataSetIndex(xIndex xIndex: Int, x: Double, y: Double) -> Int
     {
         if let barChartData = _chart?.data as? BarChartData
         {
@@ -120,15 +120,15 @@ internal class BarChartHighlighter: ChartHighlighter
     }
 
     /// This method creates the Highlight object that also indicates which value of a stacked BarEntry has been selected.
-    /// :param: old the old highlight object before looking for stacked values
-    /// :param: set
-    /// :param: xIndex
-    /// :param: dataSetIndex
-    /// :param: yValue
-    /// :returns:
-    internal func getStackedHighlight(#old: ChartHighlight?, set: BarChartDataSet, xIndex: Int, dataSetIndex: Int, yValue: Double) -> ChartHighlight?
+    /// - parameter old: the old highlight object before looking for stacked values
+    /// - parameter set:
+    /// - parameter xIndex:
+    /// - parameter dataSetIndex:
+    /// - parameter yValue:
+    /// - returns:
+    internal func getStackedHighlight(old old: ChartHighlight?, set: BarChartDataSet, xIndex: Int, dataSetIndex: Int, yValue: Double) -> ChartHighlight?
     {
-        var entry = set.entryForXIndex(xIndex) as? BarChartDataEntry
+        let entry = set.entryForXIndex(xIndex) as? BarChartDataEntry
 
         if entry?.values === nil
         {
@@ -145,10 +145,10 @@ internal class BarChartHighlighter: ChartHighlighter
     }
 
     /// Returns the index of the closest value inside the values array / ranges (stacked barchart) to the value given as a parameter.
-    /// :param: entry
-    /// :param: value
-    /// :returns:
-    internal func getClosestStackIndex(#ranges: [ChartRange]?, value: Double) -> Int
+    /// - parameter entry:
+    /// - parameter value:
+    /// - returns:
+    internal func getClosestStackIndex(ranges ranges: [ChartRange]?, value: Double) -> Int
     {
         if ranges == nil
         {
@@ -175,8 +175,8 @@ internal class BarChartHighlighter: ChartHighlighter
     }
 
     /// Returns the base x-value to the corresponding x-touch value in pixels.
-    /// :param: x
-    /// :returns:
+    /// - parameter x:
+    /// - returns:
     internal func getBase(x: Double) -> Double
     {
         if let barChartData = _chart?.data as? BarChartData
@@ -207,9 +207,9 @@ internal class BarChartHighlighter: ChartHighlighter
     }
 
     /// Splits up the stack-values of the given bar-entry into Range objects.
-    /// :param: entry
-    /// :returns:
-    internal func getRanges(#entry: BarChartDataEntry) -> [ChartRange]?
+    /// - parameter entry:
+    /// - returns:
+    internal func getRanges(entry entry: BarChartDataEntry) -> [ChartRange]?
     {
         let values = entry.values
         if (values == nil)

Charts/Classes/Highlight/ChartHighlight.swift

@@ -54,10 +54,10 @@ public class ChartHighlight: NSObject
 
     /// Constructor, only used for stacked-barchart.
     ///
-    /// :param: x the index of the highlighted value on the x-axis
-    /// :param: dataSet the index of the DataSet the highlighted value belongs to
-    /// :param: stackIndex references which value of a stacked-bar entry has been selected
-    /// :param: range the range the selected stack-value is in
+    /// - parameter x: the index of the highlighted value on the x-axis
+    /// - parameter dataSet: the index of the DataSet the highlighted value belongs to
+    /// - parameter stackIndex: references which value of a stacked-bar entry has been selected
+    /// - parameter range: the range the selected stack-value is in
     public convenience init(xIndex x: Int, dataSetIndex: Int, stackIndex: Int, range: ChartRange)
     {
         self.init(xIndex: x, dataSetIndex: dataSetIndex, stackIndex: stackIndex)
@@ -69,7 +69,7 @@ public class ChartHighlight: NSObject
     public var xIndex: Int { return _xIndex; }
     public var stackIndex: Int { return _stackIndex; }
 
-    /// :returns: the range of values the selected value of a stacked bar is in. (this is only relevant for stacked-barchart)
+    /// - returns: the range of values the selected value of a stacked bar is in. (this is only relevant for stacked-barchart)
     public var range: ChartRange? { return _range }
 
     // MARK: NSObject

Charts/Classes/Highlight/ChartHighlighter.swift

@@ -26,10 +26,10 @@ internal class ChartHighlighter
     }
 
     /// Returns a Highlight object corresponding to the given x- and y- touch positions in pixels.
-    /// :param: x
-    /// :param: y
-    /// :returns:
-    internal func getHighlight(#x: Double, y: Double) -> ChartHighlight?
+    /// - parameter x:
+    /// - parameter y:
+    /// - returns:
+    internal func getHighlight(x x: Double, y: Double) -> ChartHighlight?
     {
         let xIndex = getXIndex(x)
         if (xIndex == -Int.max)
@@ -47,8 +47,8 @@ internal class ChartHighlighter
     }
 
     /// Returns the corresponding x-index for a given touch-position in pixels.
-    /// :param: x
-    /// :returns:
+    /// - parameter x:
+    /// - returns:
     internal func getXIndex(x: Double) -> Int
     {
         // create an array of the touch-point
@@ -61,11 +61,11 @@ internal class ChartHighlighter
     }
 
     /// Returns the corresponding dataset-index for a given xIndex and xy-touch position in pixels.
-    /// :param: xIndex
-    /// :param: x
-    /// :param: y
-    /// :returns:
-    internal func getDataSetIndex(#xIndex: Int, x: Double, y: Double) -> Int
+    /// - parameter xIndex:
+    /// - parameter x:
+    /// - parameter y:
+    /// - returns:
+    internal func getDataSetIndex(xIndex xIndex: Int, x: Double, y: Double) -> Int
     {
         let valsAtIndex = getSelectionDetailsAtIndex(xIndex)
 
@@ -80,16 +80,16 @@ internal class ChartHighlighter
     }
 
     /// Returns a list of SelectionDetail object corresponding to the given xIndex.
-    /// :param: xIndex
-    /// :return:
+    /// - parameter xIndex:
+    /// - returns:
     internal func getSelectionDetailsAtIndex(xIndex: Int) -> [ChartSelectionDetail]
     {
         var vals = [ChartSelectionDetail]()
         var pt = CGPoint()
 
         for (var i = 0, dataSetCount = _chart?.data?.dataSetCount; i < dataSetCount; i++)
         {
-            var dataSet = _chart!.data!.getDataSetByIndex(i)
+            let dataSet = _chart!.data!.getDataSetByIndex(i)
 
             // dont include datasets that cannot be highlighted
             if !dataSet.isHighlightEnabled

Charts/Classes/Highlight/ChartRange.swift

@@ -28,7 +28,7 @@ public class ChartRange: NSObject
     }
 
     /// Returns true if this range contains (if the value is in between) the given value, false if not.
-    /// :param: value
+    /// - parameter value:
     public func contains(value: Double) -> Bool
     {
         if value > from && value <= to

Charts/Classes/Highlight/HorizontalBarChartHighlighter.swift

@@ -17,9 +17,9 @@ import CoreGraphics
 
 internal class HorizontalBarChartHighlighter: BarChartHighlighter
 {
-    internal override func getHighlight(#x: Double, y: Double) -> ChartHighlight?
+    internal override func getHighlight(x x: Double, y: Double) -> ChartHighlight?
     {
-        var h = super.getHighlight(x: x, y: y)
+        let h = super.getHighlight(x: x, y: y)
 
         if h === nil
         {
@@ -88,8 +88,8 @@ internal class HorizontalBarChartHighlighter: BarChartHighlighter
     }
 
     /// Returns the base y-value to the corresponding x-touch value in pixels.
-    /// :param: y
-    /// :returns:
+    /// - parameter y:
+    /// - returns:
     internal override func getBase(y: Double) -> Double
     {
         if let barChartData = _chart?.data as? BarChartData