From c7e136d9d7810836081d7d4d39185ba2738f38bb Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Fri, 22 Feb 2013 14:53:57 +0000 Subject: Various warning squashes and fixes. --- cocoa/BookmarksController.m | 1 + cocoa/BrowserView.m | 1 + cocoa/BrowserWindowController.m | 1 + cocoa/NetSurfAppDelegate.m | 9 +++++---- cocoa/selection.m | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/cocoa/BookmarksController.m b/cocoa/BookmarksController.m index 1f7be4fdf..ef5fc974e 100644 --- a/cocoa/BookmarksController.m +++ b/cocoa/BookmarksController.m @@ -27,6 +27,7 @@ #import "desktop/hotlist.h" #import "desktop/tree.h" #import "desktop/tree_url_node.h" +#import "utils/messages.h" @interface BookmarksController () - (void) noteAppWillTerminate: (NSNotification *) note; diff --git a/cocoa/BrowserView.m b/cocoa/BrowserView.m index 02aa15bab..3b947ea9b 100644 --- a/cocoa/BrowserView.m +++ b/cocoa/BrowserView.m @@ -29,6 +29,7 @@ #import "desktop/textinput.h" #import "desktop/options.h" #import "desktop/selection.h" +#import "utils/messages.h" @interface BrowserView () diff --git a/cocoa/BrowserWindowController.m b/cocoa/BrowserWindowController.m index 9e6581ecc..7688c1a58 100644 --- a/cocoa/BrowserWindowController.m +++ b/cocoa/BrowserWindowController.m @@ -27,6 +27,7 @@ #import "desktop/browser.h" #import "desktop/options.h" +#import "utils/messages.h" @interface BrowserWindowController () diff --git a/cocoa/NetSurfAppDelegate.m b/cocoa/NetSurfAppDelegate.m index fc9171b40..0a352c633 100644 --- a/cocoa/NetSurfAppDelegate.m +++ b/cocoa/NetSurfAppDelegate.m @@ -23,6 +23,7 @@ #import "desktop/browser.h" #import "desktop/options.h" +#import "utils/messages.h" @interface NetSurfAppDelegate () @@ -64,22 +65,22 @@ - (void) openDocument: (id) sender; { - nsurl *url; + nsurl *u; nserror error; NSOpenPanel *openPanel = [NSOpenPanel openPanel]; [openPanel setAllowsMultipleSelection: YES]; if ([openPanel runModalForTypes: nil] == NSOKButton) { for (NSURL *url in [openPanel URLs]) { - error = nsurl_create([[url absoluteString] UTF8String], &url); + error = nsurl_create([[url absoluteString] UTF8String], &u); if (error == NSERROR_OK) { error = browser_window_create(BROWSER_WINDOW_VERIFIABLE | BROWSER_WINDOW_HISTORY, - url, + u, NULL, NULL, NULL); - nsurl_unref(url); + nsurl_unref(u); } if (error != NSERROR_OK) { warn_user(messages_get_errorcode(error), 0); diff --git a/cocoa/selection.m b/cocoa/selection.m index ef34b4e94..acfd55087 100644 --- a/cocoa/selection.m +++ b/cocoa/selection.m @@ -82,7 +82,7 @@ void gui_set_clipboard(const char *buffer, size_t length, } /* Add text to clipboard string */ - if (nil == cocoa_clipboard_string) return false; + if (nil == cocoa_clipboard_string) return; [cocoa_clipboard_string appendString: [[[NSString alloc] initWithBytes: buffer -- cgit v1.2.3