From 8fdf262683dab03fb01941f74cfa698b1f9d6834 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Wed, 8 Jun 2016 15:30:25 +0100 Subject: remove unecessary content API usage from atari frontend --- frontends/atari/certview.c | 2 -- frontends/atari/download.c | 3 +-- frontends/atari/filetype.c | 1 - frontends/atari/gui.c | 3 +-- frontends/atari/hotlist.c | 5 ++--- frontends/atari/login.c | 4 ---- frontends/atari/misc.c | 1 - frontends/atari/rootwin.c | 4 +--- frontends/atari/toolbar.c | 3 +-- frontends/atari/treeview.c | 1 - frontends/atari/verify_ssl.c | 3 +-- 11 files changed, 7 insertions(+), 23 deletions(-) (limited to 'frontends') diff --git a/frontends/atari/certview.c b/frontends/atari/certview.c index 7f0a29528..66122a6f7 100644 --- a/frontends/atari/certview.c +++ b/frontends/atari/certview.c @@ -27,8 +27,6 @@ #include "utils/log.h" #include "utils/messages.h" #include "utils/utils.h" -#include "content/urldb.h" -#include "content/hlcache.h" #include "desktop/sslcert_viewer.h" #include "desktop/core_window.h" diff --git a/frontends/atari/download.c b/frontends/atari/download.c index ebe3cc4a0..e475a15b7 100644 --- a/frontends/atari/download.c +++ b/frontends/atari/download.c @@ -24,14 +24,13 @@ #include #include #include +#include #include "utils/log.h" #include "utils/messages.h" #include "utils/utils.h" #include "utils/nsoption.h" #include "utils/string.h" -#include "content/urldb.h" -#include "content/fetch.h" #include "desktop/save_complete.h" #include "desktop/textinput.h" #include "desktop/download.h" diff --git a/frontends/atari/filetype.c b/frontends/atari/filetype.c index 1cce6fc18..d27076e9c 100644 --- a/frontends/atari/filetype.c +++ b/frontends/atari/filetype.c @@ -24,7 +24,6 @@ #include "utils/messages.h" #include "utils/utils.h" #include "utils/log.h" -#include "content/fetch.h" #include "atari/filetype.h" diff --git a/frontends/atari/gui.c b/frontends/atari/gui.c index 16cc3193f..36ef527cb 100644 --- a/frontends/atari/gui.c +++ b/frontends/atari/gui.c @@ -39,7 +39,6 @@ #include "netsurf/content.h" #include "content/urldb.h" #include "content/backing_store.h" -#include "content/hlcache.h" #include "desktop/treeview.h" #include "atari/gemtk/gemtk.h" @@ -663,7 +662,7 @@ gui_window_remove_caret(struct gui_window *w) * \param icon handle to object to use as icon. */ static void -gui_window_set_icon(struct gui_window *g, hlcache_handle *icon) +gui_window_set_icon(struct gui_window *g, struct hlcache_handle *icon) { struct bitmap *bmp_icon; diff --git a/frontends/atari/hotlist.c b/frontends/atari/hotlist.c index 1130e6251..93145cf75 100644 --- a/frontends/atari/hotlist.c +++ b/frontends/atari/hotlist.c @@ -26,10 +26,9 @@ #include "utils/log.h" #include "utils/messages.h" #include "utils/utils.h" -#include "content/content.h" -#include "content/hlcache.h" -#include "content/urldb.h" #include "utils/nsoption.h" +#include "utils/nsurl.h" +#include "content/content.h" #include "desktop/hotlist.h" #include "desktop/tree.h" #include "desktop/core_window.h" diff --git a/frontends/atari/login.c b/frontends/atari/login.c index c44b07750..1b21c5d2a 100644 --- a/frontends/atari/login.c +++ b/frontends/atari/login.c @@ -27,10 +27,6 @@ #include "utils/utils.h" #include "utils/messages.h" #include "utils/log.h" -#include "content/content.h" -#include "content/hlcache.h" -#include "content/urldb.h" -#include "content/fetch.h" #include "atari/gui.h" #include "atari/misc.h" diff --git a/frontends/atari/misc.c b/frontends/atari/misc.c index c5a705233..7a8ec6143 100644 --- a/frontends/atari/misc.c +++ b/frontends/atari/misc.c @@ -36,7 +36,6 @@ #include "utils/utils.h" #include "utils/log.h" #include "utils/file.h" -#include "content/fetch.h" #include "atari/gui.h" #include "atari/toolbar.h" diff --git a/frontends/atari/rootwin.c b/frontends/atari/rootwin.c index d309f8dc5..d4920094f 100644 --- a/frontends/atari/rootwin.c +++ b/frontends/atari/rootwin.c @@ -37,13 +37,11 @@ #include #include "utils/log.h" +#include "utils/nsurl.h" #include "netsurf/browser_window.h" #include "netsurf/mouse.h" #include "netsurf/plotters.h" #include "desktop/textinput.h" -#include "content/content.h" -#include "content/hlcache.h" -#include "content/urldb.h" #include "atari/res/netsurf.rsh" #include "atari/gemtk/gemtk.h" diff --git a/frontends/atari/toolbar.c b/frontends/atari/toolbar.c index 27d7b531b..caf1d666d 100644 --- a/frontends/atari/toolbar.c +++ b/frontends/atari/toolbar.c @@ -40,7 +40,6 @@ #include "desktop/hotlist.h" #include "desktop/textarea.h" #include "desktop/textinput.h" -#include "content/hlcache.h" #include "atari/clipboard.h" #include "atari/gui.h" @@ -72,7 +71,7 @@ struct s_toolbar; struct s_tb_button { short rsc_id; void (*cb_click)(struct s_toolbar *tb); - hlcache_handle *icon[TOOLBAR_BUTTON_NUM_STATES]; + struct hlcache_handle *icon[TOOLBAR_BUTTON_NUM_STATES]; struct s_toolbar *owner; enum e_toolbar_button_states state; short index; diff --git a/frontends/atari/treeview.c b/frontends/atari/treeview.c index 1048fb06f..231b89321 100644 --- a/frontends/atari/treeview.c +++ b/frontends/atari/treeview.c @@ -27,7 +27,6 @@ #include "utils/log.h" #include "utils/messages.h" #include "utils/utils.h" -#include "content/urldb.h" #include "netsurf/plotters.h" #include "netsurf/mouse.h" #include "desktop/treeview.h" diff --git a/frontends/atari/verify_ssl.c b/frontends/atari/verify_ssl.c index cbd9d0bf6..055fd3057 100644 --- a/frontends/atari/verify_ssl.c +++ b/frontends/atari/verify_ssl.c @@ -27,8 +27,7 @@ #include "utils/utils.h" #include "utils/log.h" #include "utils/messages.h" -#include "content/urldb.h" -#include "content/fetch.h" + #include "atari/res/netsurf.rsh" #include "atari/verify_ssl.h" -- cgit v1.2.3