diff options
author | Sven Weidauer <sven@5sw.de> | 2017-06-05 12:43:11 +0200 |
---|---|---|
committer | Sven Weidauer <sven@5sw.de> | 2017-06-05 12:43:11 +0200 |
commit | e51c739bfc8e0c50161172952c99b8796703c6fe (patch) | |
tree | 1b3a47b5123aad511bc91a2b589a2dd2949549e3 /frontends/cocoa/NetSurfAppDelegate.m | |
parent | 2ba97ae0dbd01a4f46c543ae025249e5349e0585 (diff) | |
download | netsurf-e51c739bfc8e0c50161172952c99b8796703c6fe.tar.gz netsurf-e51c739bfc8e0c50161172952c99b8796703c6fe.tar.bz2 |
Start modernising ObjC
Diffstat (limited to 'frontends/cocoa/NetSurfAppDelegate.m')
-rw-r--r-- | frontends/cocoa/NetSurfAppDelegate.m | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/frontends/cocoa/NetSurfAppDelegate.m b/frontends/cocoa/NetSurfAppDelegate.m index 55cd714f0..013b77a8d 100644 --- a/frontends/cocoa/NetSurfAppDelegate.m +++ b/frontends/cocoa/NetSurfAppDelegate.m @@ -36,10 +36,6 @@ @implementation NetSurfAppDelegate -@synthesize history; -@synthesize search; -@synthesize preferences; - - (void)newDocument:(id)sender { nsurl *url; @@ -111,20 +107,20 @@ - (IBAction)showSearchWindow:(id)sender { - if (search == nil) { - [self setSearch:[[SearchWindowController alloc] init]]; + if (self.search == nil) { + self.search = [[SearchWindowController alloc] init]; } - [[search window] makeKeyAndOrderFront:self]; + [self.search.window makeKeyAndOrderFront:self]; } - (IBAction)searchForward:(id)sender { - [search search:SearchForward]; + [self.search search:SearchForward]; } - (IBAction)searchBackward:(id)sender { - [search search:SearchBackward]; + [self.search search:SearchBackward]; } - (BOOL)validateMenuItem:(id)item @@ -132,9 +128,9 @@ SEL action = [item action]; if (action == @selector(searchForward:)) { - return [search canGoForward]; + return [self.search canGoForward]; } else if (action == @selector(searchBackward:)) { - return [search canGoBack]; + return [self.search canGoBack]; } return YES; @@ -142,18 +138,18 @@ - (IBAction)showPreferences:(id)sender { - if (preferences == nil) { - [self setPreferences:[[PreferencesWindowController alloc] init]]; + if (self.preferences == nil) { + self.preferences = [[PreferencesWindowController alloc] init]; } - [preferences showWindow:sender]; + [self.preferences showWindow:sender]; } - (IBAction)showGlobalHistory:(id)sender { - if (history == nil) { - [self setHistory:[[HistoryWindowController alloc] init]]; + if (self.history == nil) { + self.history = [[HistoryWindowController alloc] init]; } - [history showWindow:sender]; + [self.history showWindow:sender]; } // Application delegate methods |