Skip to content

Commit

Permalink
Replace AnyObject with Any
Browse files Browse the repository at this point in the history
This is in line with how Objc interfaces are now imported
  • Loading branch information
jjatie committed Feb 24, 2019
1 parent cf36285 commit d59fe25
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion ChartsDemo-iOS/Objective-C/Components/BalloonMarker.swift
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ open class BalloonMarker: MarkerImage
fileprivate var label: String?
fileprivate var _labelSize: CGSize = CGSize()
fileprivate var _paragraphStyle: NSMutableParagraphStyle?
fileprivate var _drawAttributes = [NSAttributedString.Key : AnyObject]()
fileprivate var _drawAttributes = [NSAttributedString.Key : Any]()

@objc public init(color: UIColor, font: UIFont, textColor: UIColor, insets: UIEdgeInsets)
{
Expand Down
2 changes: 1 addition & 1 deletion ChartsDemo-iOS/Swift/Components/BalloonMarker.swift
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ open class BalloonMarker: MarkerImage
fileprivate var label: String?
fileprivate var _labelSize: CGSize = CGSize()
fileprivate var _paragraphStyle: NSMutableParagraphStyle?
fileprivate var _drawAttributes = [NSAttributedString.Key : AnyObject]()
fileprivate var _drawAttributes = [NSAttributedString.Key : Any]()

public init(color: UIColor, font: UIFont, textColor: UIColor, insets: UIEdgeInsets)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ open class BarDemoViewController: NSViewController
self.barChartView.chartDescription?.text = "Barchart Demo"
}

@IBAction func save(_ sender: AnyObject)
@IBAction func save(_ sender: Any)
{
let panel = NSSavePanel()
panel.allowedFileTypes = ["png"]
Expand Down
4 changes: 2 additions & 2 deletions Source/Charts/Utils/Platform.swift
Original file line number Diff line number Diff line change
Expand Up @@ -237,15 +237,15 @@ public typealias NSUIGestureRecognizerState = UIGestureRecognizer.State
private var displayLink: CVDisplayLink?
private var _timestamp: CFTimeInterval = 0.0

private weak var _target: AnyObject?
private weak var _target: Any?
private var _selector: Selector

public var timestamp: CFTimeInterval
{
return _timestamp
}

init(target: AnyObject, selector: Selector)
init(target: Any, selector: Selector)
{
_target = target
_selector = selector
Expand Down

0 comments on commit d59fe25

Please sign in to comment.