From 4f9dc971414cc9a26cce886370787899e1c86d18 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Mon, 2 May 2016 16:03:44 +0100 Subject: remove unecessary utils includes from RISC OS frontend --- riscos/401login.c | 1 - riscos/bitmap.c | 1 - riscos/configure.c | 4 ++-- riscos/configure/con_cache.c | 1 - riscos/configure/con_connect.c | 5 +++-- riscos/configure/con_content.c | 1 - riscos/configure/con_fonts.c | 1 - riscos/configure/con_home.c | 1 - riscos/configure/con_image.c | 1 - riscos/configure/con_language.c | 1 - riscos/configure/con_secure.c | 1 - riscos/configure/con_theme.c | 1 - riscos/content-handlers/artworks.c | 8 +++++--- riscos/content-handlers/draw.c | 8 +++++--- riscos/content-handlers/sprite.c | 10 ++++++---- riscos/cookies.c | 9 +++++---- riscos/dialog.c | 1 - riscos/filetype.c | 6 +++--- riscos/global_history.c | 1 - riscos/gui/button_bar.c | 1 - riscos/gui/throbber.c | 7 ++++--- riscos/help.c | 1 - riscos/history.c | 8 ++++---- riscos/hotlist.c | 1 - riscos/iconbar.c | 1 - riscos/image.c | 1 - riscos/menus.c | 1 - riscos/message.c | 4 ++-- riscos/mouse.c | 1 - riscos/query.h | 1 - riscos/save.c | 1 - riscos/search.c | 1 - riscos/sslcert.c | 1 - riscos/theme.c | 1 - riscos/theme_install.c | 1 - riscos/toolbar.c | 1 - riscos/treeview.c | 8 +++++--- riscos/uri.c | 1 - riscos/url_complete.c | 1 - riscos/url_protocol.c | 1 - riscos/wimp.c | 1 - riscos/wimp_event.c | 1 - 42 files changed, 44 insertions(+), 64 deletions(-) diff --git a/riscos/401login.c b/riscos/401login.c index 1494b85b1..e95a74809 100644 --- a/riscos/401login.c +++ b/riscos/401login.c @@ -25,7 +25,6 @@ #include "utils/log.h" #include "utils/messages.h" -#include "utils/utils.h" #include "content/content.h" #include "content/hlcache.h" #include "content/urldb.h" diff --git a/riscos/bitmap.c b/riscos/bitmap.c index 8fa7265cf..cc4be590c 100644 --- a/riscos/bitmap.c +++ b/riscos/bitmap.c @@ -42,7 +42,6 @@ #include "utils/nsoption.h" #include "utils/filename.h" #include "utils/log.h" -#include "utils/utils.h" #include "utils/messages.h" #include "desktop/plotters.h" #include "content/content.h" diff --git a/riscos/configure.c b/riscos/configure.c index 9953fb9b6..9d28616ec 100644 --- a/riscos/configure.c +++ b/riscos/configure.c @@ -16,7 +16,8 @@ * along with this program. If not, see . */ -/** \file +/** + * \file * RISC OS option setting (implementation). */ @@ -31,7 +32,6 @@ #include #include "utils/log.h" -#include "utils/utils.h" #include "utils/messages.h" #include "riscos/gui.h" diff --git a/riscos/configure/con_cache.c b/riscos/configure/con_cache.c index adaaa82b7..730d6f82f 100644 --- a/riscos/configure/con_cache.c +++ b/riscos/configure/con_cache.c @@ -22,7 +22,6 @@ #include "utils/nsoption.h" #include "utils/filename.h" #include "utils/messages.h" -#include "utils/utils.h" #include "riscos/gui.h" #include "riscos/wimp.h" diff --git a/riscos/configure/con_connect.c b/riscos/configure/con_connect.c index d9919d084..9515c5d6f 100644 --- a/riscos/configure/con_connect.c +++ b/riscos/configure/con_connect.c @@ -20,15 +20,16 @@ #include "swis.h" #include "oslib/osspriteop.h" #include "oslib/wimp.h" + #include "utils/nsoption.h" +#include "utils/log.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 CONNECTION_PROXY_FIELD 3 diff --git a/riscos/configure/con_content.c b/riscos/configure/con_content.c index a1d27375f..50bbd15ef 100644 --- a/riscos/configure/con_content.c +++ b/riscos/configure/con_content.c @@ -20,7 +20,6 @@ #include "utils/nsoption.h" #include "utils/messages.h" -#include "utils/utils.h" #include "riscos/gui.h" #include "riscos/wimp.h" diff --git a/riscos/configure/con_fonts.c b/riscos/configure/con_fonts.c index fdae9761b..280312843 100644 --- a/riscos/configure/con_fonts.c +++ b/riscos/configure/con_fonts.c @@ -21,7 +21,6 @@ #include "utils/nsoption.h" #include "utils/messages.h" -#include "utils/utils.h" #include "desktop/plot_style.h" #include "riscos/gui.h" diff --git a/riscos/configure/con_home.c b/riscos/configure/con_home.c index f8a13ce1b..ea8e243ed 100644 --- a/riscos/configure/con_home.c +++ b/riscos/configure/con_home.c @@ -20,7 +20,6 @@ #include #include "utils/messages.h" -#include "utils/utils.h" #include "utils/nsoption.h" #include "riscos/gui.h" diff --git a/riscos/configure/con_image.c b/riscos/configure/con_image.c index cab7ef01b..49dd4f76d 100644 --- a/riscos/configure/con_image.c +++ b/riscos/configure/con_image.c @@ -23,7 +23,6 @@ #include "utils/nsoption.h" #include "utils/log.h" -#include "utils/utils.h" #include "riscos/gui.h" #include "riscos/configure/configure.h" diff --git a/riscos/configure/con_language.c b/riscos/configure/con_language.c index b12a79588..2030c65c0 100644 --- a/riscos/configure/con_language.c +++ b/riscos/configure/con_language.c @@ -22,7 +22,6 @@ #include "utils/nsoption.h" #include "utils/log.h" #include "utils/messages.h" -#include "utils/utils.h" #include "riscos/gui.h" #include "riscos/menus.h" diff --git a/riscos/configure/con_secure.c b/riscos/configure/con_secure.c index 2e3c31484..9c8a846c3 100644 --- a/riscos/configure/con_secure.c +++ b/riscos/configure/con_secure.c @@ -20,7 +20,6 @@ #include "utils/nsoption.h" #include "utils/messages.h" -#include "utils/utils.h" #include "riscos/gui.h" #include "riscos/wimp.h" diff --git a/riscos/configure/con_theme.c b/riscos/configure/con_theme.c index e80538446..fb0d3dfb0 100644 --- a/riscos/configure/con_theme.c +++ b/riscos/configure/con_theme.c @@ -27,7 +27,6 @@ #include "utils/nsoption.h" #include "utils/log.h" #include "utils/messages.h" -#include "utils/utils.h" #include "riscos/gui.h" #include "riscos/configure/configure.h" diff --git a/riscos/content-handlers/artworks.c b/riscos/content-handlers/artworks.c index 4b5d27afb..b6f7a0d08 100644 --- a/riscos/content-handlers/artworks.c +++ b/riscos/content-handlers/artworks.c @@ -31,15 +31,17 @@ #include "swis.h" #include "oslib/os.h" #include "oslib/wimp.h" + #include "utils/config.h" +#include "utils/log.h" +#include "utils/messages.h" +#include "utils/utils.h" #include "content/content_protected.h" #include "desktop/plotters.h" + #include "riscos/content-handlers/artworks.h" #include "riscos/gui.h" #include "riscos/wimputils.h" -#include "utils/log.h" -#include "utils/messages.h" -#include "utils/utils.h" #define AWRender_FileInitAddress 0x46080 #define AWRender_RenderAddress 0x46081 diff --git a/riscos/content-handlers/draw.c b/riscos/content-handlers/draw.c index 37f69119a..f2bee16dc 100644 --- a/riscos/content-handlers/draw.c +++ b/riscos/content-handlers/draw.c @@ -28,14 +28,16 @@ #include #include #include "oslib/drawfile.h" + #include "utils/config.h" +#include "utils/log.h" +#include "utils/messages.h" +#include "utils/utils.h" #include "content/content_protected.h" #include "desktop/plotters.h" + #include "riscos/content-handlers/draw.h" #include "riscos/gui.h" -#include "utils/log.h" -#include "utils/messages.h" -#include "utils/utils.h" typedef struct draw_content { struct content base; diff --git a/riscos/content-handlers/sprite.c b/riscos/content-handlers/sprite.c index a1a6eb1da..12fed4931 100644 --- a/riscos/content-handlers/sprite.c +++ b/riscos/content-handlers/sprite.c @@ -26,16 +26,18 @@ #include #include #include "oslib/osspriteop.h" + +#include "utils/config.h" #include "utils/config.h" +#include "utils/log.h" +#include "utils/messages.h" +#include "utils/utils.h" #include "content/content_protected.h" #include "desktop/plotters.h" + #include "riscos/gui.h" #include "riscos/image.h" #include "riscos/content-handlers/sprite.h" -#include "utils/config.h" -#include "utils/log.h" -#include "utils/messages.h" -#include "utils/utils.h" #ifdef WITH_SPRITE diff --git a/riscos/cookies.c b/riscos/cookies.c index 83462cbd6..93c9f39cf 100644 --- a/riscos/cookies.c +++ b/riscos/cookies.c @@ -29,21 +29,22 @@ #include #include "oslib/wimp.h" #include "oslib/wimpspriteop.h" + +#include "utils/nsoption.h" +#include "utils/messages.h" +#include "utils/log.h" #include "content/urldb.h" #include "desktop/cookie_manager.h" #include "desktop/tree.h" #include "desktop/textinput.h" + #include "riscos/cookies.h" #include "riscos/dialog.h" #include "riscos/menus.h" -#include "utils/nsoption.h" #include "riscos/toolbar.h" #include "riscos/treeview.h" #include "riscos/wimp.h" #include "riscos/wimp_event.h" -#include "utils/messages.h" -#include "utils/log.h" -#include "utils/utils.h" static void ro_gui_cookies_toolbar_update_buttons(void); static void ro_gui_cookies_toolbar_save_buttons(char *config); diff --git a/riscos/dialog.c b/riscos/dialog.c index d3f6caffb..d4356086d 100644 --- a/riscos/dialog.c +++ b/riscos/dialog.c @@ -38,7 +38,6 @@ #include "utils/log.h" #include "utils/messages.h" #include "utils/nsurl.h" -#include "utils/utils.h" #include "desktop/version.h" #include "desktop/browser.h" diff --git a/riscos/filetype.c b/riscos/filetype.c index 1a16df0a1..99a44ae30 100644 --- a/riscos/filetype.c +++ b/riscos/filetype.c @@ -22,13 +22,13 @@ #include "oslib/mimemap.h" #include "oslib/osfile.h" +#include "utils/config.h" +#include "utils/log.h" #include "content/content.h" #include "content/fetch.h" #include "content/hlcache.h" + #include "riscos/filetype.h" -#include "utils/config.h" -#include "utils/log.h" -#include "utils/utils.h" #include "riscos/gui.h" /* type_map must be in sorted order by file_type */ diff --git a/riscos/global_history.c b/riscos/global_history.c index 7bbc53c2a..c469847e0 100644 --- a/riscos/global_history.c +++ b/riscos/global_history.c @@ -34,7 +34,6 @@ #include "utils/nsoption.h" #include "utils/messages.h" #include "utils/log.h" -#include "utils/utils.h" #include "desktop/global_history.h" #include "desktop/tree.h" #include "desktop/gui_window.h" diff --git a/riscos/gui/button_bar.c b/riscos/gui/button_bar.c index 6f8920cfc..6ecd7cffa 100644 --- a/riscos/gui/button_bar.c +++ b/riscos/gui/button_bar.c @@ -33,7 +33,6 @@ #include #include "utils/log.h" -#include "utils/utils.h" #include "riscos/gui/button_bar.h" #include "riscos/gui.h" diff --git a/riscos/gui/throbber.c b/riscos/gui/throbber.c index 437c4faba..a326f806c 100644 --- a/riscos/gui/throbber.c +++ b/riscos/gui/throbber.c @@ -30,12 +30,13 @@ #include "oslib/os.h" #include "oslib/osspriteop.h" #include "oslib/wimp.h" + +#include "utils/log.h" +#include "riscos/gui.h" + #include "riscos/gui/throbber.h" #include "riscos/theme.h" #include "riscos/wimp.h" -#include "utils/log.h" -#include "utils/utils.h" -#include "riscos/gui.h" #define THROBBER_SPRITE_NAME_LENGTH 12 #define THROBBER_ANIMATE_INTERVAL 10 diff --git a/riscos/help.c b/riscos/help.c index 3c9f5488b..73cb6957d 100644 --- a/riscos/help.c +++ b/riscos/help.c @@ -25,7 +25,6 @@ #include "utils/nsoption.h" #include "utils/log.h" -#include "utils/utils.h" #include "utils/messages.h" #include "utils/utf8.h" #include "desktop/mouse.h" diff --git a/riscos/history.c b/riscos/history.c index 4b3bed2c4..9d78f6ded 100644 --- a/riscos/history.c +++ b/riscos/history.c @@ -27,18 +27,18 @@ #include #include #include "oslib/wimp.h" + +#include "utils/nsoption.h" +#include "utils/log.h" #include "desktop/browser_history.h" #include "desktop/plotters.h" + #include "riscos/dialog.h" -#include "utils/nsoption.h" #include "riscos/gui.h" #include "riscos/mouse.h" #include "riscos/wimp.h" #include "riscos/wimp_event.h" #include "riscos/wimputils.h" -#include "utils/log.h" -#include "utils/utils.h" - static struct browser_window *history_bw; /* Last position of mouse in window. */ diff --git a/riscos/hotlist.c b/riscos/hotlist.c index c72840448..381978faf 100644 --- a/riscos/hotlist.c +++ b/riscos/hotlist.c @@ -33,7 +33,6 @@ #include "utils/log.h" #include "utils/messages.h" -#include "utils/utils.h" #include "utils/nsoption.h" #include "content/content.h" #include "content/hlcache.h" diff --git a/riscos/iconbar.c b/riscos/iconbar.c index 6024ea9b4..9cff116a1 100644 --- a/riscos/iconbar.c +++ b/riscos/iconbar.c @@ -35,7 +35,6 @@ #include "utils/nsoption.h" #include "utils/log.h" #include "utils/messages.h" -#include "utils/utils.h" #include "utils/nsurl.h" #include "desktop/browser.h" diff --git a/riscos/image.c b/riscos/image.c index 71d63349b..acbe62d98 100644 --- a/riscos/image.c +++ b/riscos/image.c @@ -24,7 +24,6 @@ #include "utils/nsoption.h" #include "utils/log.h" -#include "utils/utils.h" #include "riscos/image.h" #include "riscos/gui.h" diff --git a/riscos/menus.c b/riscos/menus.c index dcb0bf95d..37285c9d1 100644 --- a/riscos/menus.c +++ b/riscos/menus.c @@ -35,7 +35,6 @@ #include "utils/log.h" #include "utils/messages.h" -#include "utils/utils.h" #include "utils/utf8.h" #include "content/content.h" #include "content/hlcache.h" diff --git a/riscos/message.c b/riscos/message.c index 70efcc1e9..1c54ea0b7 100644 --- a/riscos/message.c +++ b/riscos/message.c @@ -26,9 +26,9 @@ #include "oslib/os.h" #include "oslib/wimp.h" -#include "riscos/message.h" #include "utils/log.h" -#include "utils/utils.h" + +#include "riscos/message.h" #include "riscos/gui.h" struct active_message { diff --git a/riscos/mouse.c b/riscos/mouse.c index 25db2ff9a..a0cc0e7ce 100644 --- a/riscos/mouse.c +++ b/riscos/mouse.c @@ -39,7 +39,6 @@ #include #include "utils/log.h" -#include "utils/utils.h" #include "riscos/mouse.h" #include "riscos/gui.h" diff --git a/riscos/query.h b/riscos/query.h index 857cce063..c60a8bbbb 100644 --- a/riscos/query.h +++ b/riscos/query.h @@ -21,7 +21,6 @@ #include #include "oslib/wimp.h" -#include "utils/utils.h" enum query_response { QUERY_CONTINUE, diff --git a/riscos/save.c b/riscos/save.c index d547e0e12..27330700c 100644 --- a/riscos/save.c +++ b/riscos/save.c @@ -40,7 +40,6 @@ #include "utils/log.h" #include "utils/messages.h" #include "utils/utf8.h" -#include "utils/utils.h" #include "content/content.h" #include "content/hlcache.h" #include "desktop/browser.h" diff --git a/riscos/search.c b/riscos/search.c index 1a178f25e..989c9aa9e 100644 --- a/riscos/search.c +++ b/riscos/search.c @@ -31,7 +31,6 @@ #include "utils/log.h" #include "utils/messages.h" -#include "utils/utils.h" #include "content/content.h" #include "content/hlcache.h" #include "desktop/browser.h" diff --git a/riscos/sslcert.c b/riscos/sslcert.c index 31e81ebff..9e43f2db1 100644 --- a/riscos/sslcert.c +++ b/riscos/sslcert.c @@ -30,7 +30,6 @@ #include "oslib/wimp.h" #include "utils/log.h" -#include "utils/utils.h" #include "content/content.h" #include "content/hlcache.h" #include "content/fetch.h" diff --git a/riscos/theme.c b/riscos/theme.c index 7f2beea32..714b9e5a1 100644 --- a/riscos/theme.c +++ b/riscos/theme.c @@ -39,7 +39,6 @@ #include "utils/nsoption.h" #include "utils/log.h" -#include "utils/utils.h" #include "content/content.h" #include "riscos/cookies.h" diff --git a/riscos/theme_install.c b/riscos/theme_install.c index 05efce49d..5c11ffb83 100644 --- a/riscos/theme_install.c +++ b/riscos/theme_install.c @@ -28,7 +28,6 @@ #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" diff --git a/riscos/toolbar.c b/riscos/toolbar.c index 173d437d6..83751a7b4 100644 --- a/riscos/toolbar.c +++ b/riscos/toolbar.c @@ -39,7 +39,6 @@ #include "oslib/wimpspriteop.h" #include "utils/log.h" -#include "utils/utils.h" #include "utils/nsoption.h" #include "content/content.h" #include "desktop/plotters.h" diff --git a/riscos/treeview.c b/riscos/treeview.c index 83c9f7ecc..3428ad3d4 100644 --- a/riscos/treeview.c +++ b/riscos/treeview.c @@ -35,11 +35,16 @@ #include "oslib/osbyte.h" #include "oslib/osspriteop.h" #include "oslib/wimp.h" + +#include "utils/log.h" +#include "utils/messages.h" +#include "utils/utils.h" #include "content/urldb.h" #include "desktop/browser.h" #include "desktop/plotters.h" #include "desktop/textinput.h" #include "desktop/tree.h" + #include "riscos/bitmap.h" #include "riscos/dialog.h" #include "riscos/gui.h" @@ -53,9 +58,6 @@ #include "riscos/wimp.h" #include "riscos/wimp_event.h" #include "riscos/wimputils.h" -#include "utils/log.h" -#include "utils/messages.h" -#include "utils/utils.h" #ifndef wimp_KEY_END #define wimp_KEY_END wimp_KEY_COPY diff --git a/riscos/uri.c b/riscos/uri.c index 0e4c0b867..9c384c9c0 100644 --- a/riscos/uri.c +++ b/riscos/uri.c @@ -28,7 +28,6 @@ #include "utils/log.h" #include "utils/messages.h" #include "utils/nsurl.h" -#include "utils/utils.h" #include "content/fetch.h" #include "desktop/browser.h" diff --git a/riscos/url_complete.c b/riscos/url_complete.c index 2ed82e2a6..3cf7f9228 100644 --- a/riscos/url_complete.c +++ b/riscos/url_complete.c @@ -29,7 +29,6 @@ #include "utils/log.h" #include "utils/nsoption.h" -#include "utils/utils.h" #include "content/urldb.h" #include "desktop/browser.h" diff --git a/riscos/url_protocol.c b/riscos/url_protocol.c index 97c9e1626..2b9ef3556 100644 --- a/riscos/url_protocol.c +++ b/riscos/url_protocol.c @@ -36,7 +36,6 @@ #include "utils/log.h" #include "utils/messages.h" #include "utils/nsurl.h" -#include "utils/utils.h" #include "utils/config.h" #include "content/fetch.h" #include "desktop/browser.h" diff --git a/riscos/wimp.c b/riscos/wimp.c index 19e5aa7d4..2579c672e 100644 --- a/riscos/wimp.c +++ b/riscos/wimp.c @@ -36,7 +36,6 @@ #include "utils/log.h" #include "utils/utf8.h" -#include "utils/utils.h" #include "riscos/gui.h" #include "riscos/oslib_pre7.h" diff --git a/riscos/wimp_event.c b/riscos/wimp_event.c index b26600492..015e87baf 100644 --- a/riscos/wimp_event.c +++ b/riscos/wimp_event.c @@ -33,7 +33,6 @@ #include "oslib/wimp.h" #include "utils/log.h" -#include "utils/utils.h" #include "riscos/gui.h" #include "riscos/dialog.h" -- cgit v1.2.3