Preferences Window Controller: Use init instead of a class property.

newmarcel · Aug 4, 2018 · d444d62 · d444d62
1 parent ea57467
commit d444d62
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/KeepingYouAwake/KYAAppDelegate.m b/KeepingYouAwake/KYAAppDelegate.m
@@ -23,7 +23,7 @@ - (NSWindowController *)preferencesWindowController
 {
     if(_preferencesWindowController == nil)
     {
-        _preferencesWindowController = [KYAPreferencesWindowController preferencesWindowController];
+        _preferencesWindowController = [KYAPreferencesWindowController new];
     }
     return _preferencesWindowController;
 }

diff --git a/KeepingYouAwake/Preferences/KYAPreferencesWindowController.h b/KeepingYouAwake/Preferences/KYAPreferencesWindowController.h
@@ -8,14 +8,18 @@
 
 #import <Cocoa/Cocoa.h>
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface KYAPreferencesWindowController : NSWindowController
 
 /**
- Instantiates a preferences window controller from the
- Preferences storyboard.
+ Instantiates a new preferences window controller
+ for the Preferences storyboard.
 
  @return A new instance.
  */
-+ (instancetype)preferencesWindowController;
+- (instancetype)init;
 
 @end
+
+NS_ASSUME_NONNULL_END
diff --git a/KeepingYouAwake/Preferences/KYAPreferencesWindowController.m b/KeepingYouAwake/Preferences/KYAPreferencesWindowController.m
@@ -15,9 +15,10 @@ @implementation KYAPreferencesWindowController
 
 #pragma mark - Life Cycle
 
-+ (instancetype)preferencesWindowController
+- (instancetype)init
 {
-    return [[NSStoryboard storyboardWithName:@"Preferences" bundle:nil] instantiateInitialController];
+    self = [[NSStoryboard storyboardWithName:@"Preferences" bundle:nil] instantiateInitialController];
+    return self;
 }
 
 - (void)windowDidLoad