Commit: 646b3d68cf4350de634ac4a309975d10f9041b82 - KanColleBrowserForOSX (git)

Commit MetaInfo

• Revisión: 646b3d68cf4350de634ac4a309975d10f9041b82 (tree)
• Tiempo: 2018-04-18 22:28:50
• Autor: masakih <masakih@user...>
• Commiter: masakih

Log Message

コーディング規約を変更した

Cambiar Resumen

• modified: KanColleBrowserForOSX.xcodeproj/project.pbxproj
• modified: KanColleBrowserForOSX/AppDelegate.swift
• modified: KanColleBrowserForOSX/KCBFOMainWindowController.swift

Diferencia incremental

--- a/KanColleBrowserForOSX.xcodeproj/project.pbxproj
+++ b/KanColleBrowserForOSX.xcodeproj/project.pbxproj
@@ -164,7 +164,7 @@
 		F4EF18A71B4D36E60021BF8D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0810;
+				LastUpgradeCheck = 0930;
 				ORGANIZATIONNAME = "Hori,Masaki";
 				TargetAttributes = {
 					F4EF18AE1B4D36E60021BF8D = {
@@ -285,14 +285,22 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -333,14 +341,22 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;

--- a/KanColleBrowserForOSX/AppDelegate.swift
+++ b/KanColleBrowserForOSX/AppDelegate.swift
@@ -14,6 +14,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 	var mainWindowController: KCBFOMainWindowController!
 	
 	func applicationDidFinishLaunching(_ aNotification: Notification) {
+        
 		mainWindowController = KCBFOMainWindowController.makeInstance()
 		mainWindowController.showWindow(nil)
 	}

--- a/KanColleBrowserForOSX/KCBFOMainWindowController.swift
+++ b/KanColleBrowserForOSX/KCBFOMainWindowController.swift
@@ -19,11 +19,13 @@ class KCBFOMainWindowController: NSWindowController {
 	let gamePageURL = "http://www.dmm.com/netgame/social/-/gadgets/=/app_id=854854/"
     
     class func makeInstance() -> KCBFOMainWindowController {
+        
         return KCBFOMainWindowController(windowNibName: "KCBFOMainWindowController")
     }
     
     
     override func windowDidLoad() {
+        
         super.windowDidLoad()
         
         let pref = WKPreferences()
@@ -40,7 +42,7 @@ class KCBFOMainWindowController: NSWindowController {
         let script = WKUserScript(source: js, injectionTime: .atDocumentEnd, forMainFrameOnly: false)
         config.userContentController.addUserScript(script)
         
-        let frame = CGRect(x: 0, y: 0, width: 2000, height: 2_000)
+        let frame = CGRect(x: 0, y: 0, width: 2_000, height: 2_000)
         webView = WKWebView(frame: frame, configuration: config)
         webView.navigationDelegate = self
 		
@@ -56,6 +58,7 @@ class KCBFOMainWindowController: NSWindowController {
     }
     
     func loadURLString(urlString: String) {
+        
         guard let url = URL(string: urlString) else { return }
         let req = URLRequest(url: url)
         webView.load(req)
@@ -63,14 +66,18 @@ class KCBFOMainWindowController: NSWindowController {
     
 	
     @IBAction func reloadContent(_ sender: AnyObject?) {
-        guard let _ = webView.url
-            else {
+        
+        guard let _ = webView.url else {
+            
                 loadURLString(urlString: gamePageURL)
+            
                 return
         }
         // ゲームページでない場合はゲームページを表示する
         if let url = webView?.url, url.absoluteString != gamePageURL {
+            
             loadURLString(urlString: gamePageURL)
+            
             return
         }
         
@@ -80,11 +87,13 @@ class KCBFOMainWindowController: NSWindowController {
         
     }
 	@IBAction func reloadAndRecache(_ sender: AnyObject?) {
+        
 		URLCache.shared.removeAllCachedResponses()
 		reloadContent(sender)
 	}
 	
 	func adjustFlash() {
+        
 		clipView.scroll(to: flashTopLeft)
 	}
 	
@@ -99,16 +108,21 @@ class KCBFOMainWindowController: NSWindowController {
 		WebMenuItemTagReload]
 	
 	func webView(_ sender: WebView!, contextMenuItemsForElement element: [AnyHashable: Any]!, defaultMenuItems: [AnyObject]!) -> [Any]! {
+        
 		return defaultMenuItems.flatMap() {
+            
 			if ignoreTags.contains($0.tag) {
+                
 				return []
 			}
+            
 			return [$0]
 		}
 	}
 }
 
 extension KCBFOMainWindowController: WKNavigationDelegate {
+    
     func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
         
         webView.evaluateJavaScript(
@@ -128,6 +142,7 @@ extension KCBFOMainWindowController: WKNavigationDelegate {
              "dict;"]
                 .reduce("", +)
         ) { (dict, error) in
+            
             error.map { print($0) }
             
             guard let param = dict as? [String: Any] else {
@@ -146,10 +161,13 @@ extension KCBFOMainWindowController: WKNavigationDelegate {
             }
             guard let top = param["top"] as? Int,
                 let left = param["left"] as? Int,
-                let width = param["width"] as? Int
-                else { return }
+                let width = param["width"] as? Int else {
+                    
+                    return
+            }
             
             DispatchQueue.main.async { [weak self] in
+                
                 guard let `self` = self else { return }
                 
                 self.flashTopLeft = NSPoint(x: CGFloat(left + (width - 800) / 2),