From 72f8e711d730fbcbbd4142bcc598bd16005df843 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Thu, 5 Jun 2014 23:01:37 +0100 Subject: additional risc os header cleanups --- riscos/401login.c | 8 +++++--- riscos/configure.c | 1 + riscos/configure/con_cache.c | 12 +++++++----- riscos/configure/con_content.c | 9 +++++---- riscos/configure/con_fonts.c | 3 ++- riscos/configure/con_home.c | 8 +++++--- riscos/configure/con_image.c | 13 ++++++++----- riscos/configure/con_inter.c | 2 +- riscos/configure/con_language.c | 10 ++++++---- riscos/configure/con_secure.c | 9 +++++---- riscos/dialog.h | 7 ++----- riscos/gui.c | 1 + riscos/iconbar.c | 1 + riscos/print.c | 1 + riscos/query.c | 3 ++- riscos/search.c | 10 ++++++---- riscos/sslcert.c | 7 +++++-- riscos/sslcert.h | 2 ++ riscos/theme_install.c | 13 ++++++++----- 19 files changed, 73 insertions(+), 47 deletions(-) (limited to 'riscos') diff --git a/riscos/401login.c b/riscos/401login.c index 367cfe090..76e28adee 100644 --- a/riscos/401login.c +++ b/riscos/401login.c @@ -22,18 +22,20 @@ #include #include #include -#include "utils/config.h" + #include "content/content.h" #include "content/hlcache.h" #include "content/urldb.h" #include "desktop/browser.h" #include "desktop/gui.h" -#include "riscos/dialog.h" -#include "riscos/wimp_event.h" #include "utils/log.h" #include "utils/messages.h" #include "utils/utils.h" +#include "riscos/gui.h" +#include "riscos/dialog.h" +#include "riscos/wimp_event.h" + #define ICON_401LOGIN_LOGIN 0 #define ICON_401LOGIN_CANCEL 1 #define ICON_401LOGIN_HOST 2 diff --git a/riscos/configure.c b/riscos/configure.c index 08bcd97c0..68aa3c0c6 100644 --- a/riscos/configure.c +++ b/riscos/configure.c @@ -34,6 +34,7 @@ #include "utils/utils.h" #include "utils/messages.h" +#include "riscos/gui.h" #include "riscos/dialog.h" #include "riscos/configure.h" #include "riscos/wimp.h" diff --git a/riscos/configure/con_cache.c b/riscos/configure/con_cache.c index 6e402fe81..cb464f799 100644 --- a/riscos/configure/con_cache.c +++ b/riscos/configure/con_cache.c @@ -17,17 +17,19 @@ */ #include -#include "oslib/hourglass.h" +#include + #include "utils/nsoption.h" -#include "riscos/dialog.h" +#include "utils/filename.h" +#include "utils/messages.h" +#include "utils/utils.h" + #include "riscos/gui.h" #include "riscos/wimp.h" #include "riscos/wimp_event.h" #include "riscos/configure.h" #include "riscos/configure/configure.h" -#include "utils/filename.h" -#include "utils/messages.h" -#include "utils/utils.h" +#include "riscos/dialog.h" #define CACHE_MEMORY_SIZE 3 diff --git a/riscos/configure/con_content.c b/riscos/configure/con_content.c index d4f3e46bb..a1d27375f 100644 --- a/riscos/configure/con_content.c +++ b/riscos/configure/con_content.c @@ -17,16 +17,17 @@ */ #include + #include "utils/nsoption.h" -#include "riscos/dialog.h" +#include "utils/messages.h" +#include "utils/utils.h" + #include "riscos/gui.h" #include "riscos/wimp.h" #include "riscos/wimp_event.h" #include "riscos/configure.h" #include "riscos/configure/configure.h" -#include "utils/messages.h" -#include "utils/utils.h" - +#include "riscos/dialog.h" #define CONTENT_BLOCK_ADVERTISEMENTS 2 #define CONTENT_BLOCK_POPUPS 3 diff --git a/riscos/configure/con_fonts.c b/riscos/configure/con_fonts.c index c2aa1dcf6..1fe427c24 100644 --- a/riscos/configure/con_fonts.c +++ b/riscos/configure/con_fonts.c @@ -24,13 +24,14 @@ #include "desktop/plot_style.h" #include "css/css.h" -#include "riscos/dialog.h" +#include "riscos/gui.h" #include "riscos/font.h" #include "riscos/menus.h" #include "riscos/wimp.h" #include "riscos/wimp_event.h" #include "riscos/configure.h" #include "riscos/configure/configure.h" +#include "riscos/dialog.h" #define FONT_SANS_FIELD 3 diff --git a/riscos/configure/con_home.c b/riscos/configure/con_home.c index 6f7d01043..4dec6ad61 100644 --- a/riscos/configure/con_home.c +++ b/riscos/configure/con_home.c @@ -17,8 +17,11 @@ */ #include + +#include "utils/messages.h" +#include "utils/utils.h" #include "utils/nsoption.h" -#include "riscos/dialog.h" + #include "riscos/gui.h" #include "riscos/menus.h" #include "riscos/url_suggest.h" @@ -26,8 +29,7 @@ #include "riscos/wimp_event.h" #include "riscos/configure.h" #include "riscos/configure/configure.h" -#include "utils/messages.h" -#include "utils/utils.h" +#include "riscos/dialog.h" #define HOME_URL_FIELD 3 #define HOME_URL_GRIGHT 4 diff --git a/riscos/configure/con_image.c b/riscos/configure/con_image.c index a5ebb85d5..ee4281856 100644 --- a/riscos/configure/con_image.c +++ b/riscos/configure/con_image.c @@ -17,18 +17,21 @@ */ #include -#include "swis.h" -#include "oslib/osspriteop.h" -#include "oslib/wimp.h" +#include +#include +#include + #include "utils/nsoption.h" +#include "utils/log.h" +#include "utils/utils.h" + +#include "riscos/gui.h" #include "riscos/configure/configure.h" #include "riscos/dialog.h" #include "riscos/menus.h" #include "riscos/tinct.h" #include "riscos/wimp.h" #include "riscos/wimp_event.h" -#include "utils/log.h" -#include "utils/utils.h" #define IMAGE_FOREGROUND_FIELD 3 diff --git a/riscos/configure/con_inter.c b/riscos/configure/con_inter.c index 30b824292..7ab912c54 100644 --- a/riscos/configure/con_inter.c +++ b/riscos/configure/con_inter.c @@ -20,12 +20,12 @@ #include "utils/nsoption.h" -#include "riscos/dialog.h" #include "riscos/gui.h" #include "riscos/wimp.h" #include "riscos/wimp_event.h" #include "riscos/configure.h" #include "riscos/configure/configure.h" +#include "riscos/dialog.h" #define INTERFACE_STRIP_EXTNS_OPTION 2 #define INTERFACE_CONFIRM_OVWR_OPTION 3 diff --git a/riscos/configure/con_language.c b/riscos/configure/con_language.c index 7e483b5af..ace7a6fdf 100644 --- a/riscos/configure/con_language.c +++ b/riscos/configure/con_language.c @@ -18,17 +18,19 @@ */ #include + #include "utils/nsoption.h" -#include "riscos/dialog.h" +#include "utils/log.h" +#include "utils/messages.h" +#include "utils/utils.h" + #include "riscos/gui.h" #include "riscos/menus.h" #include "riscos/wimp.h" #include "riscos/wimp_event.h" #include "riscos/configure.h" #include "riscos/configure/configure.h" -#include "utils/log.h" -#include "utils/messages.h" -#include "utils/utils.h" +#include "riscos/dialog.h" #define LANGUAGE_INTERFACE_FIELD 3 diff --git a/riscos/configure/con_secure.c b/riscos/configure/con_secure.c index 75e2bc705..2e3c31484 100644 --- a/riscos/configure/con_secure.c +++ b/riscos/configure/con_secure.c @@ -17,16 +17,17 @@ */ #include + #include "utils/nsoption.h" -#include "riscos/dialog.h" +#include "utils/messages.h" +#include "utils/utils.h" + #include "riscos/gui.h" #include "riscos/wimp.h" #include "riscos/wimp_event.h" #include "riscos/configure.h" #include "riscos/configure/configure.h" -#include "utils/messages.h" -#include "utils/utils.h" - +#include "riscos/dialog.h" #define SECURITY_REFERRER 2 #define SECURITY_DURATION_FIELD 6 diff --git a/riscos/dialog.h b/riscos/dialog.h index 5758ad366..463048436 100644 --- a/riscos/dialog.h +++ b/riscos/dialog.h @@ -19,11 +19,8 @@ #ifndef _NETSURF_RISCOS_DIALOG_H_ #define _NETSURF_RISCOS_DIALOG_H_ -#include -#include -#include "oslib/wimp.h" -#include "riscos/toolbar.h" -#include "riscos/gui.h" +struct toolbar; +struct gui_window; void ro_gui_dialog_init(void); wimp_w ro_gui_dialog_create(const char *template_name); diff --git a/riscos/gui.c b/riscos/gui.c index 35d3cb6d0..09f254bb4 100644 --- a/riscos/gui.c +++ b/riscos/gui.c @@ -80,6 +80,7 @@ #include "riscos/ucstables.h" #include "riscos/filetype.h" #include "riscos/font.h" +#include "riscos/toolbar.h" #include "riscos/content-handlers/artworks.h" #include "riscos/content-handlers/draw.h" #include "riscos/content-handlers/sprite.h" diff --git a/riscos/iconbar.c b/riscos/iconbar.c index bcc20d09a..11640fe7c 100644 --- a/riscos/iconbar.c +++ b/riscos/iconbar.c @@ -39,6 +39,7 @@ #include "desktop/netsurf.h" #include "desktop/browser.h" +#include "riscos/gui.h" #include "riscos/configure.h" #include "riscos/cookies.h" #include "riscos/dialog.h" diff --git a/riscos/print.c b/riscos/print.c index 360ff15c1..1f252448e 100644 --- a/riscos/print.c +++ b/riscos/print.c @@ -40,6 +40,7 @@ #include "desktop/browser_private.h" #include "desktop/plotters.h" +#include "riscos/gui.h" #include "riscos/dialog.h" #include "riscos/menus.h" #include "riscos/print.h" diff --git a/riscos/query.c b/riscos/query.c index 6f3fca27f..aa7492196 100644 --- a/riscos/query.c +++ b/riscos/query.c @@ -25,11 +25,12 @@ #include "utils/utf8.h" #include "utils/utils.h" -#include "riscos/dialog.h" +#include "riscos/gui.h" #include "riscos/query.h" #include "riscos/wimp.h" #include "riscos/wimp_event.h" #include "riscos/ucstables.h" +#include "riscos/dialog.h" #define ICON_QUERY_MESSAGE 0 #define ICON_QUERY_YES 1 diff --git a/riscos/search.c b/riscos/search.c index 0c4e6af8f..23c148028 100644 --- a/riscos/search.c +++ b/riscos/search.c @@ -27,20 +27,22 @@ #include #include "oslib/hourglass.h" #include "oslib/wimp.h" -#include "utils/config.h" + #include "content/content.h" #include "content/hlcache.h" #include "desktop/browser.h" #include "desktop/gui.h" #include "desktop/browser_private.h" #include "desktop/search.h" +#include "utils/log.h" +#include "utils/messages.h" +#include "utils/utils.h" + +#include "riscos/gui.h" #include "riscos/dialog.h" #include "riscos/menus.h" #include "riscos/wimp.h" #include "riscos/wimp_event.h" -#include "utils/log.h" -#include "utils/messages.h" -#include "utils/utils.h" #define RECENT_SEARCHES 8 diff --git a/riscos/sslcert.c b/riscos/sslcert.c index 1395d274e..a9c79687c 100644 --- a/riscos/sslcert.c +++ b/riscos/sslcert.c @@ -27,6 +27,7 @@ #include #include #include + #include "oslib/wimp.h" #include "content/content.h" #include "content/hlcache.h" @@ -36,6 +37,9 @@ #include "desktop/sslcert_viewer.h" #include "desktop/gui.h" #include "desktop/tree.h" +#include "utils/log.h" +#include "utils/utils.h" + #include "riscos/dialog.h" #include "riscos/sslcert.h" #include "riscos/textarea.h" @@ -43,8 +47,7 @@ #include "riscos/wimp.h" #include "riscos/wimp_event.h" #include "riscos/wimputils.h" -#include "utils/log.h" -#include "utils/utils.h" +#include "riscos/gui.h" #define ICON_SSL_PANE 1 #define ICON_SSL_REJECT 3 diff --git a/riscos/sslcert.h b/riscos/sslcert.h index 7fba9d3f2..17fce5552 100644 --- a/riscos/sslcert.h +++ b/riscos/sslcert.h @@ -24,6 +24,8 @@ #ifndef _NETSURF_RISCOS_SSLCERT_H_ #define _NETSURF_RISCOS_SSLCERT_H_ +struct node; + void ro_gui_cert_preinitialise(void); void ro_gui_cert_postinitialise(void); void ro_gui_cert_open(struct tree *tree, struct node *node); diff --git a/riscos/theme_install.c b/riscos/theme_install.c index 09e9bd456..f29596c88 100644 --- a/riscos/theme_install.c +++ b/riscos/theme_install.c @@ -22,19 +22,22 @@ #include #include -#include "oslib/osfile.h" +#include +#include + +#include "utils/nsoption.h" +#include "utils/log.h" +#include "utils/messages.h" +#include "utils/utils.h" #include "content/content.h" #include "content/hlcache.h" #include "desktop/browser.h" + #include "riscos/dialog.h" #include "riscos/gui.h" -#include "utils/nsoption.h" #include "riscos/theme.h" #include "riscos/wimp.h" #include "riscos/wimp_event.h" -#include "utils/log.h" -#include "utils/messages.h" -#include "utils/utils.h" static hlcache_handle *theme_install_content = NULL; -- cgit v1.2.3