Fix the MiniBrowser build with newer clang
authortimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 16 Feb 2015 19:56:02 +0000 (19:56 +0000)
committertimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 16 Feb 2015 19:56:02 +0000 (19:56 +0000)
* MiniBrowser/mac/SettingsController.m:
(-[SettingsController _toggleBooleanDefault:]):
* MiniBrowser/mac/WK1BrowserWindowController.m:
(-[WK1BrowserWindowController windowWillClose:]):
* MiniBrowser/mac/WK2BrowserWindowController.m:
(-[WK2BrowserWindowController windowWillClose:]):
NSApp is id and clang gets confused about which -delegate we're talking about.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@180164 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/MiniBrowser/mac/SettingsController.m
Tools/MiniBrowser/mac/WK1BrowserWindowController.m
Tools/MiniBrowser/mac/WK2BrowserWindowController.m

index 1f0ea379bf14674cbca0e9750c6b3b7447200f0b..4988b6301ee53105e89a11e91f2751f1eb76b297 100644 (file)
@@ -1,3 +1,15 @@
+2015-02-16  Tim Horton  <timothy_horton@apple.com>
+
+        Fix the MiniBrowser build with newer clang
+
+        * MiniBrowser/mac/SettingsController.m:
+        (-[SettingsController _toggleBooleanDefault:]):
+        * MiniBrowser/mac/WK1BrowserWindowController.m:
+        (-[WK1BrowserWindowController windowWillClose:]):
+        * MiniBrowser/mac/WK2BrowserWindowController.m:
+        (-[WK2BrowserWindowController windowWillClose:]):
+        NSApp is id and clang gets confused about which -delegate we're talking about.
+
 2015-02-16  Antti Koivisto  <antti@apple.com>
 
         Develop/Disable Caches does not properly disable disk cache
index fb4ded39a6d056a73fc2046edbbf2ef4f119faf9..009c1f746ade1d9e7531158b0e1ada83800d8da1 100644 (file)
@@ -161,7 +161,7 @@ typedef NS_ENUM(NSInteger, DebugOverylayMenuItemTag) {
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
     [defaults setBool:![defaults boolForKey:defaultName] forKey:defaultName];
 
-    [(BrowserAppDelegate *)[NSApp delegate] didChangeSettings];
+    [(BrowserAppDelegate *)[[NSApplication sharedApplication] delegate] didChangeSettings];
 }
 
 - (void)toggleUseWebKit2ByDefault:(id)sender
index 64f1f6f3b170d83af807c3c35a7375b7c4f18b78..23f53c4f7f05f46cf6bb5830213f531151a3de32 100644 (file)
 
 - (void)windowWillClose:(NSNotification *)notification
 {
-    [(BrowserAppDelegate *)[NSApp delegate] browserWindowWillClose:self.window];
+    [(BrowserAppDelegate *)[[NSApplication sharedApplication] delegate] browserWindowWillClose:self.window];
     [self autorelease];
 }
 
index c14c43d65359dbe960dbd4dca05f59de0ca37c52..e359f231109f6a61e85213428e3302b2245e7ec3 100644 (file)
@@ -228,7 +228,7 @@ static void* keyValueObservingContext = &keyValueObservingContext;
 
 - (void)windowWillClose:(NSNotification *)notification
 {
-    [(BrowserAppDelegate *)[NSApp delegate] browserWindowWillClose:self.window];
+    [(BrowserAppDelegate *)[[NSApplication sharedApplication] delegate] browserWindowWillClose:self.window];
     [self autorelease];
 }