From 59eaaf30158f6241c1dc1cf116e8fcff669176d3 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Mon, 3 Feb 2014 18:12:44 +0000 Subject: fixup missing includes --- atari/certview.c | 1 + atari/deskmenu.c | 1 + cocoa/BookmarksController.m | 2 ++ cocoa/BrowserViewController.m | 1 + cocoa/BrowserWindowController.m | 1 + cocoa/NetSurfAppDelegate.m | 1 + cocoa/PreferencesWindowController.m | 1 + cocoa/gui.m | 2 ++ riscos/gui.h | 1 + riscos/gui/url_bar.c | 12 ++++++++---- riscos/save.h | 5 +++-- 11 files changed, 22 insertions(+), 6 deletions(-) diff --git a/atari/certview.c b/atari/certview.c index 6877529d8..f3c2deead 100644 --- a/atari/certview.c +++ b/atari/certview.c @@ -32,6 +32,7 @@ #include "utils/log.h" #include "utils/messages.h" #include "utils/utils.h" +#include "content/hlcache.h" #include "atari/gui.h" #include "atari/misc.h" diff --git a/atari/deskmenu.c b/atari/deskmenu.c index ee8855cb0..663e244ac 100644 --- a/atari/deskmenu.c +++ b/atari/deskmenu.c @@ -1,5 +1,6 @@ #include #include +#include #include "utils/log.h" #include "utils/messages.h" diff --git a/cocoa/BookmarksController.m b/cocoa/BookmarksController.m index 2f8d9d839..698f27133 100644 --- a/cocoa/BookmarksController.m +++ b/cocoa/BookmarksController.m @@ -27,6 +27,8 @@ #import "desktop/hotlist.h" #import "desktop/tree.h" #import "utils/messages.h" +#import "utils/utils.h" +#inport "content/hlcache.h" @interface BookmarksController () - (void) noteAppWillTerminate: (NSNotification *) note; diff --git a/cocoa/BrowserViewController.m b/cocoa/BrowserViewController.m index 956654aba..5cc3d4c20 100644 --- a/cocoa/BrowserViewController.m +++ b/cocoa/BrowserViewController.m @@ -30,6 +30,7 @@ #import "utils/filename.h" #import "utils/messages.h" #import "utils/url.h" +#import "content/hlcache.h" @implementation BrowserViewController diff --git a/cocoa/BrowserWindowController.m b/cocoa/BrowserWindowController.m index 2edb9a1db..36b7164ce 100644 --- a/cocoa/BrowserWindowController.m +++ b/cocoa/BrowserWindowController.m @@ -28,6 +28,7 @@ #import "desktop/browser.h" #import "utils/nsoption.h" #import "utils/messages.h" +#import "utils/utils.h" @interface BrowserWindowController () diff --git a/cocoa/NetSurfAppDelegate.m b/cocoa/NetSurfAppDelegate.m index 4a66212e8..c326c9dd6 100644 --- a/cocoa/NetSurfAppDelegate.m +++ b/cocoa/NetSurfAppDelegate.m @@ -24,6 +24,7 @@ #import "desktop/browser.h" #import "utils/nsoption.h" #import "utils/messages.h" +#import "utils/utils.h" @interface NetSurfAppDelegate () diff --git a/cocoa/PreferencesWindowController.m b/cocoa/PreferencesWindowController.m index a3abe2908..54e7b91d0 100644 --- a/cocoa/PreferencesWindowController.m +++ b/cocoa/PreferencesWindowController.m @@ -25,6 +25,7 @@ #import "desktop/browser_private.h" #import "content/content.h" #import "utils/nsoption.h" +#import "content/hlcache.h" @implementation PreferencesWindowController diff --git a/cocoa/gui.m b/cocoa/gui.m index 750d9fca4..416849d84 100644 --- a/cocoa/gui.m +++ b/cocoa/gui.m @@ -35,6 +35,8 @@ #import "utils/log.h" #import "image/ico.h" #import "content/fetchers/resource.h" +#import "content/hlcache.h" +#import "content/content.h" NSString * const kCookiesFileOption = @"CookiesFile"; NSString * const kURLsFileOption = @"URLsFile"; diff --git a/riscos/gui.h b/riscos/gui.h index 823956c03..c201ab091 100644 --- a/riscos/gui.h +++ b/riscos/gui.h @@ -51,6 +51,7 @@ struct tree; struct node; struct history; struct css_style; +struct ssl_cert_info; extern wimp_t task_handle; /**< RISC OS wimp task handle. */ diff --git a/riscos/gui/url_bar.c b/riscos/gui/url_bar.c index b898e6f6c..304a6bf20 100644 --- a/riscos/gui/url_bar.c +++ b/riscos/gui/url_bar.c @@ -30,6 +30,14 @@ #include "oslib/os.h" #include "oslib/osspriteop.h" #include "oslib/wimp.h" + +#include "utils/log.h" +#include "utils/messages.h" +#include "utils/utf8.h" +#include "utils/utils.h" +#include "content/hlcache.h" +#include "content/content.h" + #include "riscos/gui.h" #include "riscos/hotlist.h" #include "riscos/gui/url_bar.h" @@ -38,10 +46,6 @@ #include "riscos/wimp.h" #include "riscos/wimp_event.h" #include "riscos/window.h" -#include "utils/log.h" -#include "utils/messages.h" -#include "utils/utf8.h" -#include "utils/utils.h" #include "riscos/ucstables.h" #define URLBAR_HEIGHT 52 diff --git a/riscos/save.h b/riscos/save.h index 0c917664a..6b83c7af1 100644 --- a/riscos/save.h +++ b/riscos/save.h @@ -25,9 +25,10 @@ #include #include "oslib/wimp.h" -#include "desktop/gui.h" -void gui_drag_save_object(struct gui_window *g, hlcache_handle *c, gui_save_type save_type); +struct hlcache_handle; + +void gui_drag_save_object(struct gui_window *g, struct hlcache_handle *c, gui_save_type save_type); void gui_drag_save_selection(struct gui_window *g, const char *selection); wimp_w ro_gui_saveas_create(const char *template_name); -- cgit v1.2.3