Convert to Swift 4

Author: keith

ModMove.xcodeproj/project.pbxproj

@@ -126,6 +126,7 @@
 				TargetAttributes = {
 					C27E73161BD9FFB00058FDD0 = {
 						CreatedOnToolsVersion = 7.1;
+						LastSwiftMigration = 0920;
 					};
 				};
 			};
@@ -287,7 +288,8 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.smileykeith.ModMove;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "ModMove/Resources/ModMove-Bridging-Header.h";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -302,7 +304,8 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.smileykeith.ModMove;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "ModMove/Resources/ModMove-Bridging-Header.h";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};

ModMove/AccessibilityElement.swift

@@ -48,11 +48,11 @@ final class AccessibilityElement {
     }
 
     func parent() -> Self? {
-        return self.value(for: kAXParentAttribute)
+        return self.value(for: .parent)
     }
 
     func role() -> String? {
-        return self.value(for: kAXRoleAttribute)
+        return self.value(for: .role)
     }
 
     func pid() -> pid_t? {
@@ -62,24 +62,24 @@ final class AccessibilityElement {
     }
 
     func bringToFront() {
-        if let isMainWindow = self.rawValue(for: NSAccessibilityMainAttribute) as? Bool, isMainWindow
+        if let isMainWindow = self.rawValue(for: .main) as? Bool, isMainWindow
         {
             return
         }
 
         AXUIElementSetAttributeValue(self.elementRef,
-                                     NSAccessibilityMainAttribute as CFString,
+                                     NSAccessibilityAttributeName.main.rawValue as CFString,
                                      true as CFTypeRef)
     }
 
     // MARK: - Private functions
 
-    static private func createSystemWideElement() -> Self {
+    private static func createSystemWideElement() -> Self {
         return self.init(elementRef: AXUIElementCreateSystemWide())
     }
 
     private func getPosition() -> CGPoint? {
-        return self.value(for: kAXPositionAttribute)
+        return self.value(for: .position)
     }
 
     private func set(position: CGPoint) {
@@ -89,7 +89,7 @@ final class AccessibilityElement {
     }
 
     private func getSize() -> CGSize? {
-        return self.value(for: kAXSizeAttribute)
+        return self.value(for: .size)
     }
 
     private func set(size: CGSize) {
@@ -98,25 +98,25 @@ final class AccessibilityElement {
         }
     }
 
-    private func rawValue(for attribute: String) -> AnyObject? {
+    private func rawValue(for attribute: NSAccessibilityAttributeName) -> AnyObject? {
         var rawValue: AnyObject?
-        let error = AXUIElementCopyAttributeValue(self.elementRef, attribute as CFString, &rawValue)
+        let error = AXUIElementCopyAttributeValue(self.elementRef, attribute.rawValue as CFString, &rawValue)
         return error == .success ? rawValue : nil
     }
 
-    private func value(for attribute: String) -> Self? {
+    private func value(for attribute: NSAccessibilityAttributeName) -> Self? {
         if let rawValue = self.rawValue(for: attribute), CFGetTypeID(rawValue) == AXUIElementGetTypeID() {
             return type(of: self).init(elementRef: rawValue as! AXUIElement)
         }
 
         return nil
     }
 
-    private func value(for attribute: String) -> String? {
+    private func value(for attribute: NSAccessibilityAttributeName) -> String? {
         return self.rawValue(for: attribute) as? String
     }
 
-    private func value<T>(for attribute: String) -> T? {
+    private func value<T>(for attribute: NSAccessibilityAttributeName) -> T? {
         if let rawValue = self.rawValue(for: attribute), CFGetTypeID(rawValue) == AXValueGetTypeID() {
             return (rawValue as! AXValue).toValue()
         }

ModMove/LoginAlert.swift

@@ -16,11 +16,11 @@ struct LoginAlert {
         alert.addButton(withTitle: "Open at Login")
         alert.addButton(withTitle: "Cancel")
         let response = alert.runModal()
-        if alert.suppressionButton?.state == NSOnState {
+        if alert.suppressionButton?.state == .on {
             UserDefaults.standard.set(true, forKey: SuppressionKey)
         }
 
-        if response == NSAlertFirstButtonReturn {
+        if response == .alertFirstButtonReturn {
             LoginController.setOpensAtLogin(true)
         }
     }

ModMove/Mover.swift

@@ -24,7 +24,7 @@ final class Mover {
             return
         }
 
-        let currentPid = NSRunningApplication.current().processIdentifier
+        let currentPid = NSRunningApplication.current.processIdentifier
         if let pid = window.pid(), pid != currentPid {
             NSRunningApplication(processIdentifier: pid)?.activate(options: .activateIgnoringOtherApps)
         }

ModMove/Observer.swift

@@ -16,7 +16,7 @@ final class Observer {
         }
     }
 
-    private func state(for flags: NSEventModifierFlags) -> FlagState {
+    private func state(for flags: NSEvent.ModifierFlags) -> FlagState {
         let hasMain = flags.contains(.control) && flags.contains(.option)
         let hasShift = flags.contains(.shift)