summaryrefslogtreecommitdiffstats
path: root/osdep/mac/swift_extensions.swift
diff options
context:
space:
mode:
Diffstat (limited to 'osdep/mac/swift_extensions.swift')
-rw-r--r--osdep/mac/swift_extensions.swift28
1 files changed, 10 insertions, 18 deletions
diff --git a/osdep/mac/swift_extensions.swift b/osdep/mac/swift_extensions.swift
index 2bb3d4bf7c..2399c86509 100644
--- a/osdep/mac/swift_extensions.swift
+++ b/osdep/mac/swift_extensions.swift
@@ -24,33 +24,25 @@ extension NSDeviceDescriptionKey {
extension NSScreen {
public var displayID: CGDirectDisplayID {
- get {
- return deviceDescription[.screenNumber] as? CGDirectDisplayID ?? 0
- }
+ return deviceDescription[.screenNumber] as? CGDirectDisplayID ?? 0
}
public var serialNumber: String {
- get {
- return String(CGDisplaySerialNumber(displayID))
- }
+ return String(CGDisplaySerialNumber(displayID))
}
public var name: String {
- get {
- // force unwrapping is fine here, regex is guaranteed to be valid
- let regex = try! NSRegularExpression(pattern: " \\(\\d+\\)$", options: .caseInsensitive)
- return regex.stringByReplacingMatches(
- in: localizedName,
- range: NSRange(location: 0, length: localizedName.count),
- withTemplate: ""
- )
- }
+ // force unwrapping is fine here, regex is guaranteed to be valid
+ let regex = try! NSRegularExpression(pattern: " \\(\\d+\\)$", options: .caseInsensitive)
+ return regex.stringByReplacingMatches(
+ in: localizedName,
+ range: NSRange(location: 0, length: localizedName.count),
+ withTemplate: ""
+ )
}
public var uniqueName: String {
- get {
- return name + " (\(serialNumber))"
- }
+ return name + " (\(serialNumber))"
}
}