Code cleanup

Author: gershnik

Translit/src/AppDelegate.mm

@@ -86,7 +86,7 @@ -(void) setVariant:(NSString *)variant forLanguage:(NSString *)language {
     auto variantKey = [language stringByAppendingString:@"_variant"];
     [defs setObject:variant forKey:variantKey];
 
-    if (id<InputControllerProtocol> __strong inputController = _inputController; inputController) {
+    if (auto inputController = makeStrong(_inputController)) {
         auto currentLanguage = inputController.currentLanguage;
         if (currentLanguage && [currentLanguage isEqualToString:language])
             [inputController changeVariant:variant];
@@ -113,7 +113,7 @@ -(void) deactivateUI {
         [_mappingsController close];
         _mappingsController = nil;
     }
-    if (NSWindowController * __strong aboutController = _aboutController; aboutController) {
+    if (auto aboutController = makeStrong(_aboutController)) {
         [aboutController close];
     }
 }

Translit/src/MappingsWindowController.mm

@@ -81,15 +81,19 @@ -(void) updateTable {
 -(void) webView:(WKWebView *)webView didFinishNavigation:(WKNavigation *)navigation {
     [webView evaluateJavaScript:@"document.getElementById('table-holder').scrollHeight"
               completionHandler:^(id result, NSError * err){
-        dispatch_async(dispatch_get_main_queue(), ^{
-            if (err)
+        if (err) {
+            os_log_error(OS_LOG_DEFAULT, "Javascript failed: %{public}@", err);
+            return;
+        }
+        dispatch_async(dispatch_get_main_queue(), [weakSelf = makeWeak(self),result]() {
+            auto self = makeStrong(weakSelf);
+            if (!self)
                 return;
             auto height = (NSNumber *)result;
             auto contentRect = self.window.contentLayoutRect;
             auto textFrame = self->_text.frame;
             auto minSize = self.window.contentMinSize;
             minSize.height = (contentRect.size.height - textFrame.size.height) + height.doubleValue;
-            os_log_info(OS_LOG_DEFAULT, "HAHAHA %{public}lf %{public}lf", contentRect.size.height, minSize.height);
             [self.window setContentMinSize:minSize];
             if (self->_firstLoad || contentRect.size.height < minSize.height)
                 [self.window setContentSize:{contentRect.size.width, minSize.height}];

Translit/src/pch.hpp

@@ -5,6 +5,7 @@
 #define TRANSLIT_HEADER_PCH_HPP_INCLUDED
 
 #include <objc-helpers/NSStringUtil.h>
+#include <objc-helpers/BlockUtil.h>
 
 #include <memory>
 #include <array>