GH-405 Use disposed(by:) instead of the old addDisposableTo()

VimR/AdvencedPref.swift

@@ -47,7 +47,7 @@ class AdvancedPref: PrefPane, UiComponent, NSTextFieldDelegate {
           self.updateViews()
         }
       })
-      .addDisposableTo(self.disposeBag)
+      .disposed(by: self.disposeBag)
   }
 
   fileprivate let emit: (Action) -> Void

VimR/AppDelegate.swift

@@ -79,7 +79,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
           self.setSparkleUrl(self.useSnapshot)
         }
       })
-      .addDisposableTo(self.disposeBag)
+      .disposed(by: self.disposeBag)
   }
 
   fileprivate let stateContext: Context

VimR/AppearancePref.swift

@@ -57,7 +57,7 @@ class AppearancePref: PrefPane, NSComboBoxDelegate, NSControlTextEditingDelegate
           self.updateViews()
         }
       })
-      .addDisposableTo(self.disposeBag)
+      .disposed(by: self.disposeBag)
   }
 
   fileprivate let emit: (Action) -> Void

VimR/Context.swift

@@ -47,7 +47,7 @@ class Context {
       )
       .merge()
       .subscribe(onNext: self.emitAppState)
-      .addDisposableTo(self.disposeBag)
+      .disposed(by: self.disposeBag)
 
     // MainWindow.State
     Observable
@@ -79,7 +79,7 @@ class Context {
       )
       .merge()
       .subscribe(onNext: self.emitAppState)
-      .addDisposableTo(self.disposeBag)
+      .disposed(by: self.disposeBag)
 
     // Preferences
     Observable
@@ -100,11 +100,11 @@ class Context {
       .merge()
       .apply(to: prefService.forPrefPanes)
       .subscribe(onNext: self.emitAppState)
-      .addDisposableTo(self.disposeBag)
+      .disposed(by: self.disposeBag)
 
 #if DEBUG
-//    actionSource.debug().subscribe().addDisposableTo(self.disposeBag)
-//    stateSource.debug().subscribe().addDisposableTo(self.disposeBag)
+//    actionSource.debug().subscribe().disposed(by: self.disposeBag)
+//    stateSource.debug().subscribe().disposed(by: self.disposeBag)
 #endif
   }
 

VimR/FileBrowser.swift

@@ -59,7 +59,7 @@ class FileBrowser: NSView,
         self.currentBufferUrl = state.currentBuffer?.url
         self.showHiddenMenuItem.boolState = state.fileBrowserShowHidden
       })
-      .addDisposableTo(self.disposeBag)
+      .disposed(by: self.disposeBag)
   }
 
   fileprivate let emit: (UuidAction<Action>) -> Void

VimR/FileMonitor.swift

@@ -55,7 +55,7 @@ class FileMonitor: UiComponent {
           self.monitors.removeValue(forKey: url)
         }
       })
-      .addDisposableTo(self.disposeBag)
+      .disposed(by: self.disposeBag)
   }
 
   fileprivate let emit: (Action) -> Void

VimR/FileOutlineView.swift

@@ -73,7 +73,7 @@ class FileOutlineView: NSOutlineView,
         self.lastFileSystemUpdateMark = state.lastFileSystemUpdate.mark
         self.update(state.lastFileSystemUpdate.payload)
       })
-      .addDisposableTo(self.disposeBag)
+      .disposed(by: self.disposeBag)
   }
 
   func select(_ url: URL) {

VimR/GeneralPref.swift

@@ -55,7 +55,7 @@ class GeneralPref: PrefPane, UiComponent, NSTextFieldDelegate {
 
 
       })
-      .addDisposableTo(self.disposeBag)
+      .disposed(by: self.disposeBag)
   }
 
   fileprivate let emit: (Action) -> Void

VimR/HtmlPreviewTool.swift

@@ -67,7 +67,7 @@ class HtmlPreviewTool: NSView, UiComponent, WKNavigationDelegate {
         self.mark = serverUrl.mark
         self.reloadWebview(with: serverUrl.payload)
       })
-      .addDisposableTo(self.disposeBag)
+      .disposed(by: self.disposeBag)
   }
 
   fileprivate func reloadWebview(with url: URL) {

VimR/MainWindow.swift

@@ -151,7 +151,7 @@ class MainWindow: NSObject,
       .subscribe(onNext: { [unowned self] action in
         self.emit(self.uuidAction(for: action))
       })
-      .addDisposableTo(self.disposeBag)
+      .disposed(by: self.disposeBag)
 
     self.addViews()
 
@@ -213,7 +213,7 @@ class MainWindow: NSObject,
         onCompleted: {
           self.windowController.close()
         })
-      .addDisposableTo(self.disposeBag)
+      .disposed(by: self.disposeBag)
 
     self.updateNeoVimAppearance()
     self.neoVimView.delegate = self

VimR/OpenQuicklyWindow.swift

@@ -89,7 +89,7 @@ class OpenQuicklyWindow: NSObject,
 
         self.windowController.showWindow(self)
       })
-      .addDisposableTo(self.disposeBag)
+      .disposed(by: self.disposeBag)
   }
 
   func reloadFileView(withScoredItems items: [ScoredFileItem]) {

VimR/OpenedFileList.swift

@@ -46,7 +46,7 @@ class OpenedFileList: NSView,
         self.bufferList.reloadData()
         self.adjustFileViewWidth()
       })
-      .addDisposableTo(self.disposeBag)
+      .disposed(by: self.disposeBag)
   }
   
   fileprivate let emit: (UuidAction<Action>) -> Void

VimR/PrefWindow.swift

@@ -53,7 +53,7 @@ class PrefWindow: NSObject,
         self.openStatusMark = state.preferencesOpen.mark
         self.windowController.showWindow(self)
       })
-      .addDisposableTo(self.disposeBag)
+      .disposed(by: self.disposeBag)
   }
 
   fileprivate let emit: (Action) -> Void

VimR/PreviewTool.swift

@@ -113,7 +113,7 @@ class PreviewTool: NSView, UiComponent, WKNavigationDelegate {
         self.webview.navigationDelegate = nil
         self.webview.removeFromSuperview()
       })
-      .addDisposableTo(self.disposeBag)
+      .disposed(by: self.disposeBag)
 
     self.webviewMessageHandler.source
       .throttle(0.75, latest: true, scheduler: self.scheduler)
@@ -122,7 +122,7 @@ class PreviewTool: NSView, UiComponent, WKNavigationDelegate {
         self.scrollTop = scrollTop
         self.emit(UuidAction(uuid: self.uuid, action: .scroll(to: self.previewPosition)))
       })
-      .addDisposableTo(self.disposeBag)
+      .disposed(by: self.disposeBag)
   }
 
   fileprivate func addViews() {

VimR/UiRoot.swift

@@ -40,7 +40,7 @@ class UiRoot: UiComponent {
           NSApp.terminate(self)
         }
       })
-      .addDisposableTo(self.disposeBag)
+      .disposed(by: self.disposeBag)
   }
 
   fileprivate let source: Observable<AppState>