Skip to content

Commit

Permalink
Removed Depracated M_PI warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
@Awalz
Awalz committed Mar 28, 2017
1 parent 0ff6028 commit c78d019
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 34 deletions.
16 changes: 8 additions & 8 deletions Sources/Paths/M13CheckboxAddRemovePathGenerator.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ internal class M13CheckboxAddRemovePathGenerator: M13CheckboxPathGenerator {
// Create a circle that starts in the middle left.
return UIBezierPath(arcCenter: CGPoint(x: size / 2.0, y: size / 2.0),
radius: radius,
startAngle: CGFloat(-M_PI),
endAngle: CGFloat((2 * M_PI) - M_PI),
startAngle: -CGFloat.pi,
endAngle: CGFloat((2 * Double.pi) - Double.pi),
clockwise: true)
}

Expand Down Expand Up @@ -58,8 +58,8 @@ internal class M13CheckboxAddRemovePathGenerator: M13CheckboxPathGenerator {
if cornerRadius != 0 {
path.addArc(withCenter: tl,
radius: cornerRadius,
startAngle: CGFloat(M_PI),
endAngle: CGFloat(M_PI + M_PI_2),
startAngle: CGFloat.pi,
endAngle: CGFloat(Double.pi + (Double.pi / 2)),
clockwise: true)
}

Expand All @@ -70,7 +70,7 @@ internal class M13CheckboxAddRemovePathGenerator: M13CheckboxPathGenerator {
if cornerRadius != 0 {
path.addArc(withCenter: tr,
radius: cornerRadius,
startAngle: CGFloat(-M_PI_2),
startAngle: -(CGFloat.pi / 2),
endAngle: 0.0,
clockwise: true)
}
Expand All @@ -83,7 +83,7 @@ internal class M13CheckboxAddRemovePathGenerator: M13CheckboxPathGenerator {
path.addArc(withCenter: br,
radius: cornerRadius,
startAngle: 0.0,
endAngle: CGFloat(M_PI_2),
endAngle: CGFloat.pi / 2,
clockwise: true)
}
// Bottom side.
Expand All @@ -93,8 +93,8 @@ internal class M13CheckboxAddRemovePathGenerator: M13CheckboxPathGenerator {
if cornerRadius != 0 {
path.addArc(withCenter: bl,
radius: cornerRadius,
startAngle: CGFloat(M_PI_2),
endAngle: CGFloat(M_PI),
startAngle: CGFloat.pi / 2,
endAngle: CGFloat.pi,
clockwise: true)
}

Expand Down
20 changes: 10 additions & 10 deletions Sources/Paths/M13CheckboxCheckPathGenerator.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ internal class M13CheckboxCheckPathGenerator: M13CheckboxPathGenerator {
struct CheckmarkProperties {

/// The angle between the x-axis, and the line created between the origin, and the location where the extended long arm of the checkmark meets the box. (Diagram: Θ)
var longArmBoxIntersectionAngle: CGFloat = 45.0 * CGFloat(M_PI / 180.0)
var longArmBoxIntersectionAngle: CGFloat = 45.0 * CGFloat(Double.pi / 180.0)

/// The distance from the center the long arm of the checkmark draws to, as a percentage of size. (Diagram: S)
var longArmRadius: (circle: CGFloat, box: CGFloat) = (circle: 0.22, box: 0.33)
Expand Down Expand Up @@ -183,7 +183,7 @@ internal class M13CheckboxCheckPathGenerator: M13CheckboxPathGenerator {
return UIBezierPath(arcCenter: CGPoint(x: size / 2.0, y: size / 2.0),
radius: radius,
startAngle: -checkmarkProperties.longArmBoxIntersectionAngle,
endAngle: CGFloat(2 * M_PI) - checkmarkProperties.longArmBoxIntersectionAngle,
endAngle: CGFloat(2 * Double.pi) - checkmarkProperties.longArmBoxIntersectionAngle,
clockwise: true)
}

Expand Down Expand Up @@ -216,7 +216,7 @@ internal class M13CheckboxCheckPathGenerator: M13CheckboxPathGenerator {
if cornerRadius != 0 {
path.addArc(withCenter: tr,
radius: cornerRadius,
startAngle: CGFloat(-M_PI_4),
startAngle: -(CGFloat.pi / 4),
endAngle: 0.0,
clockwise: true)
}
Expand All @@ -229,7 +229,7 @@ internal class M13CheckboxCheckPathGenerator: M13CheckboxPathGenerator {
path.addArc(withCenter: br,
radius: cornerRadius,
startAngle: 0.0,
endAngle: CGFloat(M_PI_2),
endAngle: CGFloat.pi / 2,
clockwise: true)
}
// Bottom side.
Expand All @@ -239,8 +239,8 @@ internal class M13CheckboxCheckPathGenerator: M13CheckboxPathGenerator {
if cornerRadius != 0 {
path.addArc(withCenter: bl,
radius: cornerRadius,
startAngle: CGFloat(M_PI_2),
endAngle: CGFloat(M_PI),
startAngle: CGFloat.pi / 2,
endAngle: CGFloat.pi,
clockwise: true)
}
// Left side.
Expand All @@ -250,8 +250,8 @@ internal class M13CheckboxCheckPathGenerator: M13CheckboxPathGenerator {
if cornerRadius != 0 {
path.addArc(withCenter: tl,
radius: cornerRadius,
startAngle: CGFloat(M_PI),
endAngle: CGFloat(M_PI + M_PI_2),
startAngle: CGFloat.pi,
endAngle: CGFloat(CGFloat.pi + (CGFloat.pi / 2)),
clockwise: true)
}
// Top side.
Expand All @@ -261,8 +261,8 @@ internal class M13CheckboxCheckPathGenerator: M13CheckboxPathGenerator {
if cornerRadius != 0 {
path.addArc(withCenter: tr,
radius: cornerRadius,
startAngle: CGFloat(M_PI + M_PI_2),
endAngle: CGFloat(M_PI + M_PI_2 + M_PI_4),
startAngle: CGFloat(CGFloat.pi + (CGFloat.pi / 2)),
endAngle: CGFloat(CGFloat.pi + (CGFloat.pi / 2) + (CGFloat.pi / 4)),
clockwise: true)
}
path.close()
Expand Down
16 changes: 8 additions & 8 deletions Sources/Paths/M13CheckboxDisclosurePathGenerator.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ internal class M13CheckboxDisclosurePathGenerator: M13CheckboxPathGenerator {
// Create a circle that starts in the middle left.
return UIBezierPath(arcCenter: CGPoint(x: size / 2.0, y: size / 2.0),
radius: radius,
startAngle: CGFloat(-M_PI),
endAngle: CGFloat((2 * M_PI) - M_PI),
startAngle: -CGFloat.pi,
endAngle: CGFloat((2 * Double.pi) - Double.pi),
clockwise: true)
}

Expand Down Expand Up @@ -58,8 +58,8 @@ internal class M13CheckboxDisclosurePathGenerator: M13CheckboxPathGenerator {
if cornerRadius != 0 {
path.addArc(withCenter: tl,
radius: cornerRadius,
startAngle: CGFloat(M_PI),
endAngle: CGFloat(M_PI + M_PI_2),
startAngle: CGFloat.pi,
endAngle: CGFloat(Double.pi + (Double.pi / 2)),
clockwise: true)
}

Expand All @@ -70,7 +70,7 @@ internal class M13CheckboxDisclosurePathGenerator: M13CheckboxPathGenerator {
if cornerRadius != 0 {
path.addArc(withCenter: tr,
radius: cornerRadius,
startAngle: CGFloat(-M_PI_2),
startAngle: -(CGFloat.pi / 2),
endAngle: 0.0,
clockwise: true)
}
Expand All @@ -83,7 +83,7 @@ internal class M13CheckboxDisclosurePathGenerator: M13CheckboxPathGenerator {
path.addArc(withCenter: br,
radius: cornerRadius,
startAngle: 0.0,
endAngle: CGFloat(M_PI_2),
endAngle: CGFloat.pi / 2,
clockwise: true)
}
// Bottom side.
Expand All @@ -93,8 +93,8 @@ internal class M13CheckboxDisclosurePathGenerator: M13CheckboxPathGenerator {
if cornerRadius != 0 {
path.addArc(withCenter: bl,
radius: cornerRadius,
startAngle: CGFloat(M_PI_2),
endAngle: CGFloat(M_PI),
startAngle: CGFloat.pi / 2,
endAngle: CGFloat.pi,
clockwise: true)
}

Expand Down
16 changes: 8 additions & 8 deletions Sources/Paths/M13CheckboxPathGenerator.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ internal class M13CheckboxPathGenerator {
// Create a circle that starts in the top right hand corner.
return UIBezierPath(arcCenter: CGPoint(x: size / 2.0, y: size / 2.0),
radius: radius,
startAngle: CGFloat(-M_PI_2),
endAngle: CGFloat((2 * M_PI) - M_PI_2),
startAngle: -(CGFloat.pi / 2),
endAngle: CGFloat((2 * Double.pi) - (Double.pi / 2)),
clockwise: true)
}

Expand Down Expand Up @@ -100,7 +100,7 @@ internal class M13CheckboxPathGenerator {
if cornerRadius != 0 {
path.addArc(withCenter: tr,
radius: cornerRadius,
startAngle: CGFloat(-M_PI_2),
startAngle: -(CGFloat.pi / 2),
endAngle: 0.0,
clockwise: true)
}
Expand All @@ -113,7 +113,7 @@ internal class M13CheckboxPathGenerator {
path.addArc(withCenter: br,
radius: cornerRadius,
startAngle: 0.0,
endAngle: CGFloat(M_PI_2),
endAngle: CGFloat.pi / 2,
clockwise: true)
}
// Bottom side.
Expand All @@ -123,8 +123,8 @@ internal class M13CheckboxPathGenerator {
if cornerRadius != 0 {
path.addArc(withCenter: bl,
radius: cornerRadius,
startAngle: CGFloat(M_PI_2),
endAngle: CGFloat(M_PI),
startAngle: CGFloat.pi / 2,
endAngle: CGFloat.pi,
clockwise: true)
}

Expand All @@ -135,8 +135,8 @@ internal class M13CheckboxPathGenerator {
if cornerRadius != 0 {
path.addArc(withCenter: tl,
radius: cornerRadius,
startAngle: CGFloat(M_PI),
endAngle: CGFloat(M_PI + M_PI_2),
startAngle: CGFloat.pi,
endAngle: CGFloat(Double.pi + (Double.pi / 2)),
clockwise: true)
}
path.close()
Expand Down

0 comments on commit c78d019

Please sign in to comment.