From 6807b4208a27d9037229b16f31cc409d15a992f5 Mon Sep 17 00:00:00 2001 From: Daniel Silverstone Date: Wed, 30 May 2007 22:39:54 +0000 Subject: Remove the netsurf/ from the include paths and rationalise use of <> vs "" in includes NetSurf includes are now done with ""s and other system includes with <>s as C intended. The scandeps tool has been updated to only look for ""ed includes, and to verify that the files exist in the tree before adding them to the dependency lines. The depend rule has therefore been augmented to make sure the autogenerated files are built before it is run. This is untested under self-hosted RISC OS builds. All else tested and works. svn path=/trunk/netsurf/; revision=3307 --- riscos/401login.c | 24 ++++++------- riscos/artworks.c | 16 ++++----- riscos/bitmap.c | 24 ++++++------- riscos/bitmap.h | 4 +-- riscos/buffer.c | 14 ++++---- riscos/configure.c | 16 ++++----- riscos/configure/con_cache.c | 22 ++++++------ riscos/configure/con_connect.c | 22 ++++++------ riscos/configure/con_content.c | 20 +++++------ riscos/configure/con_fonts.c | 24 ++++++------- riscos/configure/con_home.c | 22 ++++++------ riscos/configure/con_image.c | 22 ++++++------ riscos/configure/con_inter.c | 14 ++++---- riscos/configure/con_language.c | 24 ++++++------- riscos/configure/con_memory.c | 14 ++++---- riscos/configure/con_secure.c | 20 +++++------ riscos/configure/con_theme.c | 28 +++++++-------- riscos/cookies.c | 30 ++++++++-------- riscos/debugwin.c | 12 +++---- riscos/dialog.c | 40 +++++++++++----------- riscos/dialog.h | 4 +-- riscos/download.c | 28 +++++++-------- riscos/draw.c | 16 ++++----- riscos/filetype.c | 12 +++---- riscos/font.c | 14 ++++---- riscos/global_history.c | 30 ++++++++-------- riscos/gui.c | 76 ++++++++++++++++++++--------------------- riscos/gui.h | 6 ++-- riscos/gui/progress_bar.c | 16 ++++----- riscos/gui/progress_bar.h | 2 +- riscos/gui/status_bar.c | 16 ++++----- riscos/help.c | 24 ++++++------- riscos/history.c | 20 +++++------ riscos/hotlist.c | 28 +++++++-------- riscos/image.c | 16 ++++----- riscos/image.h | 2 +- riscos/menus.c | 50 +++++++++++++-------------- riscos/menus.h | 2 +- riscos/message.c | 6 ++-- riscos/options.h | 4 +-- riscos/palettes.c | 2 +- riscos/plotters.c | 12 +++---- riscos/plugin.c | 32 ++++++++--------- riscos/plugin.h | 4 +-- riscos/print.c | 30 ++++++++-------- riscos/query.c | 16 ++++----- riscos/query.h | 2 +- riscos/save.c | 44 ++++++++++++------------ riscos/save.h | 2 +- riscos/save_complete.c | 24 ++++++------- riscos/save_draw.c | 14 ++++---- riscos/schedule.c | 4 +-- riscos/search.c | 28 +++++++-------- riscos/sprite.c | 20 +++++------ riscos/sprite.h | 2 +- riscos/sslcert.c | 28 +++++++-------- riscos/textarea.c | 14 ++++---- riscos/textselection.c | 22 ++++++------ riscos/textselection.h | 2 +- riscos/theme.c | 24 ++++++------- riscos/theme_install.c | 24 ++++++------- riscos/thumbnail.c | 24 ++++++------- riscos/thumbnail.h | 4 +-- riscos/treeview.c | 38 ++++++++++----------- riscos/treeview.h | 6 ++-- riscos/ucstables.c | 8 ++--- riscos/uri.c | 18 +++++----- riscos/url_complete.c | 20 +++++------ riscos/url_protocol.c | 18 +++++----- riscos/wimp.c | 14 ++++---- riscos/wimp_event.c | 16 ++++----- riscos/window.c | 68 ++++++++++++++++++------------------ 72 files changed, 684 insertions(+), 684 deletions(-) (limited to 'riscos') diff --git a/riscos/401login.c b/riscos/401login.c index b15436a33..66093c876 100644 --- a/riscos/401login.c +++ b/riscos/401login.c @@ -11,18 +11,18 @@ #include #include #include "oslib/wimp.h" -#include "netsurf/utils/config.h" -#include "netsurf/content/content.h" -#include "netsurf/content/urldb.h" -#include "netsurf/desktop/browser.h" -#include "netsurf/desktop/401login.h" -#include "netsurf/desktop/gui.h" -#include "netsurf/riscos/dialog.h" -#include "netsurf/riscos/wimp_event.h" -#include "netsurf/utils/log.h" -#include "netsurf/utils/messages.h" -#include "netsurf/utils/url.h" -#include "netsurf/utils/utils.h" +#include "utils/config.h" +#include "content/content.h" +#include "content/urldb.h" +#include "desktop/browser.h" +#include "desktop/401login.h" +#include "desktop/gui.h" +#include "riscos/dialog.h" +#include "riscos/wimp_event.h" +#include "utils/log.h" +#include "utils/messages.h" +#include "utils/url.h" +#include "utils/utils.h" #ifdef WITH_AUTH diff --git a/riscos/artworks.c b/riscos/artworks.c index 9cc219de1..6ff060d8d 100644 --- a/riscos/artworks.c +++ b/riscos/artworks.c @@ -17,14 +17,14 @@ #include "swis.h" #include "oslib/os.h" #include "oslib/wimp.h" -#include "netsurf/utils/config.h" -#include "netsurf/desktop/plotters.h" -#include "netsurf/content/content.h" -#include "netsurf/riscos/artworks.h" -#include "netsurf/riscos/gui.h" -#include "netsurf/utils/utils.h" -#include "netsurf/utils/messages.h" -#include "netsurf/utils/log.h" +#include "utils/config.h" +#include "desktop/plotters.h" +#include "content/content.h" +#include "riscos/artworks.h" +#include "riscos/gui.h" +#include "utils/utils.h" +#include "utils/messages.h" +#include "utils/log.h" #ifdef WITH_ARTWORKS diff --git a/riscos/bitmap.c b/riscos/bitmap.c index 1ac260b6b..9f0f4ced0 100644 --- a/riscos/bitmap.c +++ b/riscos/bitmap.c @@ -19,18 +19,18 @@ #include #include #include "oslib/osfile.h" -#include "oslib/osspriteop.h" -#include "netsurf/content/content.h" -#include "netsurf/image/bitmap.h" -#include "netsurf/riscos/bitmap.h" -#include "netsurf/riscos/image.h" -#include "netsurf/riscos/options.h" -#include "netsurf/riscos/palettes.h" -#include "netsurf/riscos/sprite.h" -#include "netsurf/riscos/tinct.h" -#include "netsurf/utils/filename.h" -#include "netsurf/utils/log.h" -#include "netsurf/utils/utils.h" +#include +#include "content/content.h" +#include "image/bitmap.h" +#include "riscos/bitmap.h" +#include "riscos/image.h" +#include "riscos/options.h" +#include "riscos/palettes.h" +#include "riscos/sprite.h" +#include "riscos/tinct.h" +#include "utils/filename.h" +#include "utils/log.h" +#include "utils/utils.h" /** Colour in the overlay sprite that allows the bitmap to show through */ #define OVERLAY_INDEX 0xfe diff --git a/riscos/bitmap.h b/riscos/bitmap.h index d90679c25..3ca0088a2 100644 --- a/riscos/bitmap.h +++ b/riscos/bitmap.h @@ -8,8 +8,8 @@ #ifndef _NETSURF_RISCOS_BITMAP_H_ #define _NETSURF_RISCOS_BITMAP_H_ -#include "oslib/osspriteop.h" -#include "netsurf/image/bitmap.h" +#include +#include "image/bitmap.h" struct osspriteop_area; diff --git a/riscos/buffer.c b/riscos/buffer.c index 4351acf3e..ae8426e9d 100644 --- a/riscos/buffer.c +++ b/riscos/buffer.c @@ -11,15 +11,15 @@ #include #include "oslib/colourtrans.h" #include "oslib/os.h" -#include "oslib/osspriteop.h" +#include #include "oslib/wimp.h" #include "oslib/wimpreadsysinfo.h" -#include "netsurf/riscos/buffer.h" -#include "netsurf/riscos/gui.h" -#include "netsurf/riscos/options.h" -#include "netsurf/riscos/tinct.h" -#include "netsurf/riscos/wimp.h" -#include "netsurf/utils/log.h" +#include "riscos/buffer.h" +#include "riscos/gui.h" +#include "riscos/options.h" +#include "riscos/tinct.h" +#include "riscos/wimp.h" +#include "utils/log.h" //#define NDEBUG #define BUFFER_EXCLUSIVE_USER_REDRAW "Only support pure user redraw (faster)" //#define BUFFER_EMULATE_32BPP "Redirect to a 32bpp sprite and plot with Tinct" diff --git a/riscos/configure.c b/riscos/configure.c index bbb9e705a..5974adeff 100644 --- a/riscos/configure.c +++ b/riscos/configure.c @@ -18,14 +18,14 @@ #include "oslib/osbyte.h" #include "oslib/territory.h" #include "oslib/wimp.h" -#include "netsurf/riscos/dialog.h" -#include "netsurf/riscos/configure.h" -#include "netsurf/riscos/wimp.h" -#include "netsurf/riscos/wimp_event.h" -#include "netsurf/riscos/configure/configure.h" -#include "netsurf/utils/log.h" -#include "netsurf/utils/utils.h" -#include "netsurf/utils/messages.h" +#include "riscos/dialog.h" +#include "riscos/configure.h" +#include "riscos/wimp.h" +#include "riscos/wimp_event.h" +#include "riscos/configure/configure.h" +#include "utils/log.h" +#include "utils/utils.h" +#include "utils/messages.h" #define CONFIGURE_ICON_PADDING_H 32 #define CONFIGURE_ICON_PADDING_V 32 diff --git a/riscos/configure/con_cache.c b/riscos/configure/con_cache.c index 1835ea607..4fb8283eb 100644 --- a/riscos/configure/con_cache.c +++ b/riscos/configure/con_cache.c @@ -6,17 +6,17 @@ */ #include "oslib/hourglass.h" -#include "netsurf/desktop/options.h" -#include "netsurf/riscos/dialog.h" -#include "netsurf/riscos/gui.h" -#include "netsurf/riscos/options.h" -#include "netsurf/riscos/wimp.h" -#include "netsurf/riscos/wimp_event.h" -#include "netsurf/riscos/configure.h" -#include "netsurf/riscos/configure/configure.h" -#include "netsurf/utils/filename.h" -#include "netsurf/utils/messages.h" -#include "netsurf/utils/utils.h" +#include "desktop/options.h" +#include "riscos/dialog.h" +#include "riscos/gui.h" +#include "riscos/options.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" #define CACHE_MEMORY_SIZE 3 diff --git a/riscos/configure/con_connect.c b/riscos/configure/con_connect.c index 42dac5f72..f47e7ddb8 100644 --- a/riscos/configure/con_connect.c +++ b/riscos/configure/con_connect.c @@ -7,18 +7,18 @@ #include #include -#include "oslib/osspriteop.h" +#include #include "oslib/wimp.h" -#include "netsurf/desktop/options.h" -#include "netsurf/riscos/configure/configure.h" -#include "netsurf/riscos/dialog.h" -#include "netsurf/riscos/menus.h" -#include "netsurf/riscos/options.h" -#include "netsurf/riscos/tinct.h" -#include "netsurf/riscos/wimp.h" -#include "netsurf/riscos/wimp_event.h" -#include "netsurf/utils/log.h" -#include "netsurf/utils/utils.h" +#include "desktop/options.h" +#include "riscos/configure/configure.h" +#include "riscos/dialog.h" +#include "riscos/menus.h" +#include "riscos/options.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 6e762eeb0..7bbc6f928 100644 --- a/riscos/configure/con_content.c +++ b/riscos/configure/con_content.c @@ -5,16 +5,16 @@ * Copyright 2006 Richard Wilson */ -#include "netsurf/desktop/options.h" -#include "netsurf/riscos/dialog.h" -#include "netsurf/riscos/gui.h" -#include "netsurf/riscos/options.h" -#include "netsurf/riscos/wimp.h" -#include "netsurf/riscos/wimp_event.h" -#include "netsurf/riscos/configure.h" -#include "netsurf/riscos/configure/configure.h" -#include "netsurf/utils/messages.h" -#include "netsurf/utils/utils.h" +#include "desktop/options.h" +#include "riscos/dialog.h" +#include "riscos/gui.h" +#include "riscos/options.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" #define CONTENT_BLOCK_ADVERTISEMENTS 2 diff --git a/riscos/configure/con_fonts.c b/riscos/configure/con_fonts.c index 81d9a576d..be767f730 100644 --- a/riscos/configure/con_fonts.c +++ b/riscos/configure/con_fonts.c @@ -5,18 +5,18 @@ * Copyright 2005 Richard Wilson */ -#include "netsurf/css/css.h" -#include "netsurf/desktop/options.h" -#include "netsurf/riscos/dialog.h" -#include "netsurf/riscos/gui.h" -#include "netsurf/riscos/menus.h" -#include "netsurf/riscos/options.h" -#include "netsurf/riscos/wimp.h" -#include "netsurf/riscos/wimp_event.h" -#include "netsurf/riscos/configure.h" -#include "netsurf/riscos/configure/configure.h" -#include "netsurf/utils/messages.h" -#include "netsurf/utils/utils.h" +#include "css/css.h" +#include "desktop/options.h" +#include "riscos/dialog.h" +#include "riscos/gui.h" +#include "riscos/menus.h" +#include "riscos/options.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" #define FONT_SANS_FIELD 3 diff --git a/riscos/configure/con_home.c b/riscos/configure/con_home.c index 26d104ebf..a2e3ab958 100644 --- a/riscos/configure/con_home.c +++ b/riscos/configure/con_home.c @@ -5,17 +5,17 @@ * Copyright 2005 Richard Wilson */ -#include "netsurf/desktop/options.h" -#include "netsurf/riscos/dialog.h" -#include "netsurf/riscos/gui.h" -#include "netsurf/riscos/menus.h" -#include "netsurf/riscos/options.h" -#include "netsurf/riscos/wimp.h" -#include "netsurf/riscos/wimp_event.h" -#include "netsurf/riscos/configure.h" -#include "netsurf/riscos/configure/configure.h" -#include "netsurf/utils/messages.h" -#include "netsurf/utils/utils.h" +#include "desktop/options.h" +#include "riscos/dialog.h" +#include "riscos/gui.h" +#include "riscos/menus.h" +#include "riscos/options.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" #define HOME_URL_FIELD 3 diff --git a/riscos/configure/con_image.c b/riscos/configure/con_image.c index 3d67fc1f4..6892fd758 100644 --- a/riscos/configure/con_image.c +++ b/riscos/configure/con_image.c @@ -7,18 +7,18 @@ #include #include -#include "oslib/osspriteop.h" +#include #include "oslib/wimp.h" -#include "netsurf/desktop/options.h" -#include "netsurf/riscos/configure/configure.h" -#include "netsurf/riscos/dialog.h" -#include "netsurf/riscos/menus.h" -#include "netsurf/riscos/options.h" -#include "netsurf/riscos/tinct.h" -#include "netsurf/riscos/wimp.h" -#include "netsurf/riscos/wimp_event.h" -#include "netsurf/utils/log.h" -#include "netsurf/utils/utils.h" +#include "desktop/options.h" +#include "riscos/configure/configure.h" +#include "riscos/dialog.h" +#include "riscos/menus.h" +#include "riscos/options.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 a649270a5..186874e61 100644 --- a/riscos/configure/con_inter.c +++ b/riscos/configure/con_inter.c @@ -5,13 +5,13 @@ * Copyright 2006 Adrian Lees */ -#include "netsurf/riscos/dialog.h" -#include "netsurf/riscos/gui.h" -#include "netsurf/riscos/options.h" -#include "netsurf/riscos/wimp.h" -#include "netsurf/riscos/wimp_event.h" -#include "netsurf/riscos/configure.h" -#include "netsurf/riscos/configure/configure.h" +#include "riscos/dialog.h" +#include "riscos/gui.h" +#include "riscos/options.h" +#include "riscos/wimp.h" +#include "riscos/wimp_event.h" +#include "riscos/configure.h" +#include "riscos/configure/configure.h" #define INTERFACE_STRIP_EXTNS_OPTION 2 diff --git a/riscos/configure/con_language.c b/riscos/configure/con_language.c index 637f84ac9..f458f6df8 100644 --- a/riscos/configure/con_language.c +++ b/riscos/configure/con_language.c @@ -6,18 +6,18 @@ * Copyright 2006 Richard Wilson */ -#include "netsurf/desktop/options.h" -#include "netsurf/riscos/dialog.h" -#include "netsurf/riscos/gui.h" -#include "netsurf/riscos/menus.h" -#include "netsurf/riscos/options.h" -#include "netsurf/riscos/wimp.h" -#include "netsurf/riscos/wimp_event.h" -#include "netsurf/riscos/configure.h" -#include "netsurf/riscos/configure/configure.h" -#include "netsurf/utils/log.h" -#include "netsurf/utils/messages.h" -#include "netsurf/utils/utils.h" +#include "desktop/options.h" +#include "riscos/dialog.h" +#include "riscos/gui.h" +#include "riscos/menus.h" +#include "riscos/options.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" #define LANGUAGE_INTERFACE_FIELD 3 diff --git a/riscos/configure/con_memory.c b/riscos/configure/con_memory.c index c5c7466e1..1bfa8d567 100644 --- a/riscos/configure/con_memory.c +++ b/riscos/configure/con_memory.c @@ -5,13 +5,13 @@ * Copyright 2006 Richard Wilson */ -#include "netsurf/desktop/options.h" -#include "netsurf/riscos/bitmap.h" -#include "netsurf/riscos/options.h" -#include "netsurf/riscos/wimp.h" -#include "netsurf/riscos/wimp_event.h" -#include "netsurf/riscos/dialog.h" -#include "netsurf/riscos/configure/configure.h" +#include "desktop/options.h" +#include "riscos/bitmap.h" +#include "riscos/options.h" +#include "riscos/wimp.h" +#include "riscos/wimp_event.h" +#include "riscos/dialog.h" +#include "riscos/configure/configure.h" #define MEMORY_DIRECT_FIELD 3 diff --git a/riscos/configure/con_secure.c b/riscos/configure/con_secure.c index 2b16f3116..46f30bd0f 100644 --- a/riscos/configure/con_secure.c +++ b/riscos/configure/con_secure.c @@ -5,16 +5,16 @@ * Copyright 2006 Richard Wilson */ -#include "netsurf/desktop/options.h" -#include "netsurf/riscos/dialog.h" -#include "netsurf/riscos/gui.h" -#include "netsurf/riscos/options.h" -#include "netsurf/riscos/wimp.h" -#include "netsurf/riscos/wimp_event.h" -#include "netsurf/riscos/configure.h" -#include "netsurf/riscos/configure/configure.h" -#include "netsurf/utils/messages.h" -#include "netsurf/utils/utils.h" +#include "desktop/options.h" +#include "riscos/dialog.h" +#include "riscos/gui.h" +#include "riscos/options.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" #define SECURITY_REFERRER 2 diff --git a/riscos/configure/con_theme.c b/riscos/configure/con_theme.c index de0a10583..d8dfda6fb 100644 --- a/riscos/configure/con_theme.c +++ b/riscos/configure/con_theme.c @@ -8,22 +8,22 @@ #include #include #include -#include "oslib/osspriteop.h" +#include #include "oslib/wimp.h" #include "oslib/wimpspriteop.h" -#include "netsurf/utils/config.h" -#include "netsurf/riscos/configure/configure.h" -#include "netsurf/riscos/configure.h" -#include "netsurf/riscos/dialog.h" -#include "netsurf/riscos/menus.h" -#include "netsurf/riscos/options.h" -#include "netsurf/riscos/theme.h" -#include "netsurf/riscos/url_complete.h" -#include "netsurf/riscos/wimp.h" -#include "netsurf/riscos/wimp_event.h" -#include "netsurf/utils/log.h" -#include "netsurf/utils/messages.h" -#include "netsurf/utils/utils.h" +#include "utils/config.h" +#include "riscos/configure/configure.h" +#include "riscos/configure.h" +#include "riscos/dialog.h" +#include "riscos/menus.h" +#include "riscos/options.h" +#include "riscos/theme.h" +#include "riscos/url_complete.h" +#include "riscos/wimp.h" +#include "riscos/wimp_event.h" +#include "utils/log.h" +#include "utils/messages.h" +#include "utils/utils.h" #define THEME_PANE_AREA 0 diff --git a/riscos/cookies.c b/riscos/cookies.c index 809d404d3..0c370c379 100644 --- a/riscos/cookies.c +++ b/riscos/cookies.c @@ -17,21 +17,21 @@ #include #include "oslib/wimp.h" #include "oslib/wimpspriteop.h" -#include "netsurf/content/urldb.h" -#include "netsurf/desktop/cookies.h" -#include "netsurf/desktop/tree.h" -#include "netsurf/riscos/cookies.h" -#include "netsurf/riscos/dialog.h" -#include "netsurf/riscos/menus.h" -#include "netsurf/riscos/options.h" -#include "netsurf/riscos/theme.h" -#include "netsurf/riscos/treeview.h" -#include "netsurf/riscos/wimp.h" -#include "netsurf/riscos/wimp_event.h" -#include "netsurf/utils/messages.h" -#include "netsurf/utils/log.h" -#include "netsurf/utils/url.h" -#include "netsurf/utils/utils.h" +#include "content/urldb.h" +#include "desktop/cookies.h" +#include "desktop/tree.h" +#include "riscos/cookies.h" +#include "riscos/dialog.h" +#include "riscos/menus.h" +#include "riscos/options.h" +#include "riscos/theme.h" +#include "riscos/treeview.h" +#include "riscos/wimp.h" +#include "riscos/wimp_event.h" +#include "utils/messages.h" +#include "utils/log.h" +#include "utils/url.h" +#include "utils/utils.h" static bool ro_gui_cookies_click(wimp_pointer *pointer); static struct node *ro_gui_cookies_find(const char *url); diff --git a/riscos/debugwin.c b/riscos/debugwin.c index dfdc3dfd3..85577f41c 100644 --- a/riscos/debugwin.c +++ b/riscos/debugwin.c @@ -12,12 +12,12 @@ #include #include #include "oslib/wimp.h" -#include "netsurf/content/content.h" -#include "netsurf/riscos/dialog.h" -#include "netsurf/riscos/wimp_event.h" -#include "netsurf/utils/log.h" -#include "netsurf/utils/talloc.h" -#include "netsurf/utils/utils.h" +#include "content/content.h" +#include "riscos/dialog.h" +#include "riscos/wimp_event.h" +#include "utils/log.h" +#include "utils/talloc.h" +#include "utils/utils.h" /** Update interval / cs. */ #define DEBUGWIN_UPDATE 500 diff --git a/riscos/dialog.c b/riscos/dialog.c index c0d224d69..562ef052c 100644 --- a/riscos/dialog.c +++ b/riscos/dialog.c @@ -17,28 +17,28 @@ #include "oslib/colourtrans.h" #include "oslib/osfile.h" #include "oslib/osgbpb.h" -#include "oslib/osspriteop.h" +#include #include "oslib/wimp.h" #include "rufl.h" -#include "netsurf/utils/config.h" -#include "netsurf/desktop/netsurf.h" -#include "netsurf/render/font.h" -#include "netsurf/riscos/configure.h" -#include "netsurf/riscos/cookies.h" -#include "netsurf/riscos/dialog.h" -#include "netsurf/riscos/global_history.h" -#include "netsurf/riscos/gui.h" -#include "netsurf/riscos/menus.h" -#include "netsurf/riscos/options.h" -#include "netsurf/riscos/save.h" -#include "netsurf/riscos/theme.h" -#include "netsurf/riscos/url_complete.h" -#include "netsurf/riscos/wimp.h" -#include "netsurf/riscos/wimp_event.h" -#include "netsurf/utils/log.h" -#include "netsurf/utils/messages.h" -#include "netsurf/utils/url.h" -#include "netsurf/utils/utils.h" +#include "utils/config.h" +#include "desktop/netsurf.h" +#include "render/font.h" +#include "riscos/configure.h" +#include "riscos/cookies.h" +#include "riscos/dialog.h" +#include "riscos/global_history.h" +#include "riscos/gui.h" +#include "riscos/menus.h" +#include "riscos/options.h" +#include "riscos/save.h" +#include "riscos/theme.h" +#include "riscos/url_complete.h" +#include "riscos/wimp.h" +#include "riscos/wimp_event.h" +#include "utils/log.h" +#include "utils/messages.h" +#include "utils/url.h" +#include "utils/utils.h" #define ICON_ZOOM_VALUE 1 #define ICON_ZOOM_DEC 2 diff --git a/riscos/dialog.h b/riscos/dialog.h index d1963565a..2373e2dae 100644 --- a/riscos/dialog.h +++ b/riscos/dialog.h @@ -11,10 +11,10 @@ #include #include #include -#include "netsurf/riscos/theme.h" +#include "riscos/theme.h" -#include "netsurf/riscos/gui.h" +#include "riscos/gui.h" diff --git a/riscos/download.c b/riscos/download.c index 37c8e03d0..f28bfed20 100644 --- a/riscos/download.c +++ b/riscos/download.c @@ -30,20 +30,20 @@ #include "oslib/osgbpb.h" #include "oslib/wimp.h" #include "oslib/wimpspriteop.h" -#include "netsurf/content/fetch.h" -#include "netsurf/desktop/gui.h" -#include "netsurf/desktop/netsurf.h" -#include "netsurf/riscos/dialog.h" -#include "netsurf/riscos/options.h" -#include "netsurf/riscos/save.h" -#include "netsurf/riscos/query.h" -#include "netsurf/riscos/wimp.h" -#include "netsurf/riscos/wimp_event.h" -#include "netsurf/utils/log.h" -#include "netsurf/utils/messages.h" -#include "netsurf/utils/url.h" -#include "netsurf/utils/utf8.h" -#include "netsurf/utils/utils.h" +#include "content/fetch.h" +#include "desktop/gui.h" +#include "desktop/netsurf.h" +#include "riscos/dialog.h" +#include "riscos/options.h" +#include "riscos/save.h" +#include "riscos/query.h" +#include "riscos/wimp.h" +#include "riscos/wimp_event.h" +#include "utils/log.h" +#include "utils/messages.h" +#include "utils/url.h" +#include "utils/utf8.h" +#include "utils/utils.h" #define ICON_DOWNLOAD_ICON 0 #define ICON_DOWNLOAD_URL 1 diff --git a/riscos/draw.c b/riscos/draw.c index 489da7ff9..4fc154ea5 100644 --- a/riscos/draw.c +++ b/riscos/draw.c @@ -14,14 +14,14 @@ #include #include #include "oslib/drawfile.h" -#include "netsurf/utils/config.h" -#include "netsurf/desktop/plotters.h" -#include "netsurf/content/content.h" -#include "netsurf/riscos/draw.h" -#include "netsurf/riscos/gui.h" -#include "netsurf/utils/utils.h" -#include "netsurf/utils/messages.h" -#include "netsurf/utils/log.h" +#include "utils/config.h" +#include "desktop/plotters.h" +#include "content/content.h" +#include "riscos/draw.h" +#include "riscos/gui.h" +#include "utils/utils.h" +#include "utils/messages.h" +#include "utils/log.h" #ifdef WITH_DRAW diff --git a/riscos/filetype.c b/riscos/filetype.c index eb226685a..914d76ec8 100644 --- a/riscos/filetype.c +++ b/riscos/filetype.c @@ -10,12 +10,12 @@ #include #include "oslib/mimemap.h" #include "oslib/osfile.h" -#include "netsurf/content/content.h" -#include "netsurf/content/fetch.h" -#include "netsurf/riscos/gui.h" -#include "netsurf/utils/config.h" -#include "netsurf/utils/log.h" -#include "netsurf/utils/utils.h" +#include "content/content.h" +#include "content/fetch.h" +#include "riscos/gui.h" +#include "utils/config.h" +#include "utils/log.h" +#include "utils/utils.h" /* type_map must be in sorted order by file_type */ struct type_entry { diff --git a/riscos/font.c b/riscos/font.c index 40cc0874f..cda57d76b 100644 --- a/riscos/font.c +++ b/riscos/font.c @@ -16,13 +16,13 @@ #include "oslib/wimp.h" #include "oslib/wimpreadsysinfo.h" #include "rufl.h" -#include "netsurf/css/css.h" -#include "netsurf/render/font.h" -#include "netsurf/riscos/gui.h" -#include "netsurf/riscos/options.h" -#include "netsurf/utils/log.h" -#include "netsurf/utils/messages.h" -#include "netsurf/utils/utils.h" +#include "css/css.h" +#include "render/font.h" +#include "riscos/gui.h" +#include "riscos/options.h" +#include "utils/log.h" +#include "utils/messages.h" +#include "utils/utils.h" /** desktop font, size and style being used */ diff --git a/riscos/global_history.c b/riscos/global_history.c index f6e260af2..26c6b44d8 100644 --- a/riscos/global_history.c +++ b/riscos/global_history.c @@ -17,21 +17,21 @@ #include #include "oslib/wimp.h" #include "oslib/wimpspriteop.h" -#include "netsurf/content/urldb.h" -#include "netsurf/desktop/tree.h" -#include "netsurf/riscos/dialog.h" -#include "netsurf/riscos/global_history.h" -#include "netsurf/riscos/gui.h" -#include "netsurf/riscos/menus.h" -#include "netsurf/riscos/options.h" -#include "netsurf/riscos/theme.h" -#include "netsurf/riscos/treeview.h" -#include "netsurf/riscos/wimp.h" -#include "netsurf/riscos/wimp_event.h" -#include "netsurf/utils/messages.h" -#include "netsurf/utils/log.h" -#include "netsurf/utils/url.h" -#include "netsurf/utils/utils.h" +#include "content/urldb.h" +#include "desktop/tree.h" +#include "riscos/dialog.h" +#include "riscos/global_history.h" +#include "riscos/gui.h" +#include "riscos/menus.h" +#include "riscos/options.h" +#include "riscos/theme.h" +#include "riscos/treeview.h" +#include "riscos/wimp.h" +#include "riscos/wimp_event.h" +#include "utils/messages.h" +#include "utils/log.h" +#include "utils/url.h" +#include "utils/utils.h" #define MAXIMUM_URL_LENGTH 1024 #define MAXIMUM_BASE_NODES 16 diff --git a/riscos/gui.c b/riscos/gui.c index 28eaa8c3e..0d34af698 100644 --- a/riscos/gui.c +++ b/riscos/gui.c @@ -32,58 +32,58 @@ #include "oslib/osfscontrol.h" #include "oslib/osgbpb.h" #include "oslib/osmodule.h" -#include "oslib/osspriteop.h" +#include #include "oslib/pdriver.h" #include "oslib/plugin.h" #include "oslib/wimp.h" #include "oslib/wimpspriteop.h" #include "oslib/uri.h" #include "rufl.h" -#include "netsurf/utils/config.h" -#include "netsurf/content/content.h" -#include "netsurf/content/urldb.h" -#include "netsurf/desktop/gui.h" -#include "netsurf/desktop/netsurf.h" -#include "netsurf/desktop/options.h" -#include "netsurf/desktop/tree.h" -#include "netsurf/render/box.h" -#include "netsurf/render/font.h" -#include "netsurf/render/html.h" -#include "netsurf/riscos/bitmap.h" -#include "netsurf/riscos/buffer.h" -#include "netsurf/riscos/dialog.h" -#include "netsurf/riscos/global_history.h" -#include "netsurf/riscos/gui.h" -#include "netsurf/riscos/help.h" -#include "netsurf/riscos/menus.h" -#include "netsurf/riscos/message.h" -#include "netsurf/riscos/options.h" +#include "utils/config.h" +#include "content/content.h" +#include "content/urldb.h" +#include "desktop/gui.h" +#include "desktop/netsurf.h" +#include "desktop/options.h" +#include "desktop/tree.h" +#include "render/box.h" +#include "render/font.h" +#include "render/html.h" +#include "riscos/bitmap.h" +#include "riscos/buffer.h" +#include "riscos/dialog.h" +#include "riscos/global_history.h" +#include "riscos/gui.h" +#include "riscos/help.h" +#include "riscos/menus.h" +#include "riscos/message.h" +#include "riscos/options.h" #ifdef WITH_PLUGIN -#include "netsurf/riscos/plugin.h" +#include "riscos/plugin.h" #endif #ifdef WITH_PRINT -#include "netsurf/riscos/print.h" +#include "riscos/print.h" #endif -#include "netsurf/riscos/query.h" -#include "netsurf/riscos/save.h" -#include "netsurf/riscos/save_complete.h" -#include "netsurf/riscos/textselection.h" -#include "netsurf/riscos/theme.h" -#include "netsurf/riscos/treeview.h" +#include "riscos/query.h" +#include "riscos/save.h" +#include "riscos/save_complete.h" +#include "riscos/textselection.h" +#include "riscos/theme.h" +#include "riscos/treeview.h" #ifdef WITH_URI -#include "netsurf/riscos/uri.h" +#include "riscos/uri.h" #endif #ifdef WITH_URL -#include "netsurf/riscos/url_protocol.h" +#include "riscos/url_protocol.h" #endif -#include "netsurf/riscos/url_complete.h" -#include "netsurf/riscos/wimp.h" -#include "netsurf/riscos/wimp_event.h" -#include "netsurf/utils/filename.h" -#include "netsurf/utils/log.h" -#include "netsurf/utils/messages.h" -#include "netsurf/utils/url.h" -#include "netsurf/utils/utils.h" +#include "riscos/url_complete.h" +#include "riscos/wimp.h" +#include "riscos/wimp_event.h" +#include "utils/filename.h" +#include "utils/log.h" +#include "utils/messages.h" +#include "utils/url.h" +#include "utils/utils.h" diff --git a/riscos/gui.h b/riscos/gui.h index 50c821dd6..2bc251060 100644 --- a/riscos/gui.h +++ b/riscos/gui.h @@ -15,9 +15,9 @@ #include #include #include -#include "netsurf/desktop/browser.h" -#include "netsurf/content/content_type.h" -#include "netsurf/utils/config.h" +#include "desktop/browser.h" +#include "content/content_type.h" +#include "utils/config.h" #define RISCOS5 0xAA diff --git a/riscos/gui/progress_bar.c b/riscos/gui/progress_bar.c index 0ca2d28b0..072c43df0 100644 --- a/riscos/gui/progress_bar.c +++ b/riscos/gui/progress_bar.c @@ -15,16 +15,16 @@ #include #include "oslib/colourtrans.h" #include "oslib/os.h" -#include "oslib/osspriteop.h" +#include #include "oslib/wimp.h" #include "oslib/wimpspriteop.h" -#include "netsurf/desktop/plotters.h" -#include "netsurf/utils/log.h" -#include "netsurf/utils/utils.h" -#include "netsurf/riscos/gui.h" -#include "netsurf/riscos/tinct.h" -#include "netsurf/riscos/wimp_event.h" -#include "netsurf/riscos/gui/progress_bar.h" +#include "desktop/plotters.h" +#include "utils/log.h" +#include "utils/utils.h" +#include "riscos/gui.h" +#include "riscos/tinct.h" +#include "riscos/wimp_event.h" +#include "riscos/gui/progress_bar.h" #define MARGIN 6 diff --git a/riscos/gui/progress_bar.h b/riscos/gui/progress_bar.h index b93a36d39..0bcf2bafc 100644 --- a/riscos/gui/progress_bar.h +++ b/riscos/gui/progress_bar.h @@ -10,7 +10,7 @@ */ #include -#include "oslib/osspriteop.h" +#include #include "oslib/wimp.h" #ifndef _NETSURF_RISCOS_PROGRESS_BAR_H_ diff --git a/riscos/gui/status_bar.c b/riscos/gui/status_bar.c index 84ce994c8..ef7d5062f 100644 --- a/riscos/gui/status_bar.c +++ b/riscos/gui/status_bar.c @@ -17,14 +17,14 @@ #include "oslib/os.h" #include "oslib/wimp.h" #include "oslib/wimpspriteop.h" -#include "netsurf/desktop/plotters.h" -#include "netsurf/utils/log.h" -#include "netsurf/utils/utils.h" -#include "netsurf/riscos/gui.h" -#include "netsurf/riscos/wimp.h" -#include "netsurf/riscos/wimp_event.h" -#include "netsurf/riscos/gui/progress_bar.h" -#include "netsurf/riscos/gui/status_bar.h" +#include "desktop/plotters.h" +#include "utils/log.h" +#include "utils/utils.h" +#include "riscos/gui.h" +#include "riscos/wimp.h" +#include "riscos/wimp_event.h" +#include "riscos/gui/progress_bar.h" +#include "riscos/gui/status_bar.h" #define ICON_WIDGET 0 #define WIDGET_WIDTH 12 diff --git a/riscos/help.c b/riscos/help.c index b536dbc61..97fd11668 100644 --- a/riscos/help.c +++ b/riscos/help.c @@ -16,18 +16,18 @@ #include "oslib/os.h" #include "oslib/taskmanager.h" #include "oslib/wimp.h" -#include "netsurf/desktop/tree.h" -#include "netsurf/riscos/gui.h" -#include "netsurf/riscos/help.h" -#include "netsurf/riscos/menus.h" -#include "netsurf/riscos/theme.h" -#include "netsurf/riscos/treeview.h" -#include "netsurf/riscos/wimp.h" -#include "netsurf/riscos/wimp_event.h" -#include "netsurf/utils/messages.h" -#include "netsurf/utils/log.h" -#include "netsurf/utils/utf8.h" -#include "netsurf/utils/utils.h" +#include "desktop/tree.h" +#include "riscos/gui.h" +#include "riscos/help.h" +#include "riscos/menus.h" +#include "riscos/theme.h" +#include "riscos/treeview.h" +#include "riscos/wimp.h" +#include "riscos/wimp_event.h" +#include "utils/messages.h" +#include "utils/log.h" +#include "utils/utf8.h" +#include "utils/utils.h" /* Recognised help keys diff --git a/riscos/history.c b/riscos/history.c index d5146701b..a1a13156f 100644 --- a/riscos/history.c +++ b/riscos/history.c @@ -16,16 +16,16 @@ #include #include #include "oslib/wimp.h" -#include "netsurf/desktop/history_core.h" -#include "netsurf/desktop/plotters.h" -#include "netsurf/riscos/dialog.h" -#include "netsurf/riscos/options.h" -#include "netsurf/riscos/gui.h" -#include "netsurf/riscos/wimp.h" -#include "netsurf/riscos/wimp_event.h" -#include "netsurf/utils/log.h" -#include "netsurf/utils/url.h" -#include "netsurf/utils/utils.h" +#include "desktop/history_core.h" +#include "desktop/plotters.h" +#include "riscos/dialog.h" +#include "riscos/options.h" +#include "riscos/gui.h" +#include "riscos/wimp.h" +#include "riscos/wimp_event.h" +#include "utils/log.h" +#include "utils/url.h" +#include "utils/utils.h" static struct browser_window *history_bw; diff --git a/riscos/hotlist.c b/riscos/hotlist.c index 26ec6dbd0..2ac540fc3 100644 --- a/riscos/hotlist.c +++ b/riscos/hotlist.c @@ -16,20 +16,20 @@ #include #include "oslib/osfile.h" #include "oslib/wimp.h" -#include "netsurf/content/content.h" -#include "netsurf/content/urldb.h" -#include "netsurf/desktop/tree.h" -#include "netsurf/riscos/dialog.h" -#include "netsurf/riscos/menus.h" -#include "netsurf/riscos/options.h" -#include "netsurf/riscos/theme.h" -#include "netsurf/riscos/treeview.h" -#include "netsurf/riscos/wimp.h" -#include "netsurf/riscos/wimp_event.h" -#include "netsurf/utils/log.h" -#include "netsurf/utils/messages.h" -#include "netsurf/utils/utils.h" -#include "netsurf/utils/url.h" +#include "content/content.h" +#include "content/urldb.h" +#include "desktop/tree.h" +#include "riscos/dialog.h" +#include "riscos/menus.h" +#include "riscos/options.h" +#include "riscos/theme.h" +#include "riscos/treeview.h" +#include "riscos/wimp.h" +#include "riscos/wimp_event.h" +#include "utils/log.h" +#include "utils/messages.h" +#include "utils/utils.h" +#include "utils/url.h" static void ro_gui_hotlist_visited(struct content *content, struct tree *tree, diff --git a/riscos/image.c b/riscos/image.c index 531b0770a..61219c77f 100644 --- a/riscos/image.c +++ b/riscos/image.c @@ -9,14 +9,14 @@ #include #include "oslib/colourtrans.h" -#include "oslib/osspriteop.h" - -#include "netsurf/riscos/image.h" -#include "netsurf/riscos/gui.h" -#include "netsurf/riscos/options.h" -#include "netsurf/riscos/tinct.h" -#include "netsurf/utils/log.h" -#include "netsurf/utils/utils.h" +#include + +#include "riscos/image.h" +#include "riscos/gui.h" +#include "riscos/options.h" +#include "riscos/tinct.h" +#include "utils/log.h" +#include "utils/utils.h" static bool image_redraw_tinct(osspriteop_id header, int x, int y, diff --git a/riscos/image.h b/riscos/image.h index 85f913e55..2f591e6ff 100644 --- a/riscos/image.h +++ b/riscos/image.h @@ -8,7 +8,7 @@ #ifndef _NETSURF_RISCOS_IMAGE_H_ #define _NETSURF_RISCOS_IMAGE_H_ -#include "oslib/osspriteop.h" +#include struct osspriteop_area; diff --git a/riscos/menus.c b/riscos/menus.c index 6650bb356..823b530fd 100644 --- a/riscos/menus.c +++ b/riscos/menus.c @@ -20,31 +20,31 @@ #include "oslib/osgbpb.h" #include "oslib/territory.h" #include "oslib/wimp.h" -#include "netsurf/content/urldb.h" -#include "netsurf/desktop/gui.h" -#include "netsurf/desktop/history_core.h" -#include "netsurf/desktop/netsurf.h" -#include "netsurf/render/box.h" -#include "netsurf/riscos/dialog.h" -#include "netsurf/render/form.h" -#include "netsurf/riscos/configure.h" -#include "netsurf/riscos/cookies.h" -#include "netsurf/riscos/gui.h" -#include "netsurf/riscos/global_history.h" -#include "netsurf/riscos/help.h" -#include "netsurf/riscos/menus.h" -#include "netsurf/riscos/options.h" -#include "netsurf/riscos/save.h" -#include "netsurf/riscos/tinct.h" -#include "netsurf/riscos/theme.h" -#include "netsurf/riscos/treeview.h" -#include "netsurf/riscos/wimp.h" -#include "netsurf/riscos/wimp_event.h" -#include "netsurf/utils/log.h" -#include "netsurf/utils/messages.h" -#include "netsurf/utils/url.h" -#include "netsurf/utils/utils.h" -#include "netsurf/utils/utf8.h" +#include "content/urldb.h" +#include "desktop/gui.h" +#include "desktop/history_core.h" +#include "desktop/netsurf.h" +#include "render/box.h" +#include "riscos/dialog.h" +#include "render/form.h" +#include "riscos/configure.h" +#include "riscos/cookies.h" +#include "riscos/gui.h" +#include "riscos/global_history.h" +#include "riscos/help.h" +#include "riscos/menus.h" +#include "riscos/options.h" +#include "riscos/save.h" +#include "riscos/tinct.h" +#include "riscos/theme.h" +#include "riscos/treeview.h" +#include "riscos/wimp.h" +#include "riscos/wimp_event.h" +#include "utils/log.h" +#include "utils/messages.h" +#include "utils/url.h" +#include "utils/utils.h" +#include "utils/utf8.h" struct ns_menu_entry { diff --git a/riscos/menus.h b/riscos/menus.h index 13a4ed249..78293124d 100644 --- a/riscos/menus.h +++ b/riscos/menus.h @@ -10,7 +10,7 @@ #include #include "oslib/wimp.h" -#include "netsurf/riscos/gui.h" +#include "riscos/gui.h" extern wimp_menu *iconbar_menu, *browser_menu, *hotlist_menu, *cookies_menu, *global_history_menu, *image_quality_menu, diff --git a/riscos/message.c b/riscos/message.c index 1e2208f1c..cb2cf7e49 100644 --- a/riscos/message.c +++ b/riscos/message.c @@ -14,9 +14,9 @@ #include #include "oslib/os.h" #include "oslib/wimp.h" -#include "netsurf/riscos/message.h" -#include "netsurf/utils/log.h" -#include "netsurf/utils/utils.h" +#include "riscos/message.h" +#include "utils/log.h" +#include "utils/utils.h" struct active_message { diff --git a/riscos/options.h b/riscos/options.h index d013d7a51..1aa2c2f0f 100644 --- a/riscos/options.h +++ b/riscos/options.h @@ -14,8 +14,8 @@ #ifndef _NETSURF_RISCOS_OPTIONS_H_ #define _NETSURF_RISCOS_OPTIONS_H_ -#include "netsurf/desktop/options.h" -#include "netsurf/riscos/tinct.h" +#include "desktop/options.h" +#include "riscos/tinct.h" extern bool option_allow_text_selection; extern char *option_theme; diff --git a/riscos/palettes.c b/riscos/palettes.c index 8ab68e2a1..bbda19324 100644 --- a/riscos/palettes.c +++ b/riscos/palettes.c @@ -9,7 +9,7 @@ * Palette definitions for sprites */ -#include "netsurf/riscos/palettes.h" +#include "riscos/palettes.h" const os_colour default_palette1[] = diff --git a/riscos/plotters.c b/riscos/plotters.c index defa68337..b719adbbd 100644 --- a/riscos/plotters.c +++ b/riscos/plotters.c @@ -13,12 +13,12 @@ #include "oslib/colourtrans.h" #include "oslib/draw.h" #include "oslib/os.h" -#include "netsurf/desktop/plotters.h" -#include "netsurf/render/font.h" -#include "netsurf/riscos/bitmap.h" -#include "netsurf/riscos/image.h" -#include "netsurf/riscos/gui.h" -#include "netsurf/utils/log.h" +#include "desktop/plotters.h" +#include "render/font.h" +#include "riscos/bitmap.h" +#include "riscos/image.h" +#include "riscos/gui.h" +#include "utils/log.h" diff --git a/riscos/plugin.c b/riscos/plugin.c index 57f6f6515..e0dc02f9d 100644 --- a/riscos/plugin.c +++ b/riscos/plugin.c @@ -41,22 +41,22 @@ #include "oslib/plugin.h" #include "oslib/wimp.h" -#include "netsurf/utils/config.h" -#include "netsurf/content/content.h" -#include "netsurf/content/fetch.h" -#include "netsurf/content/fetchcache.h" -#include "netsurf/desktop/browser.h" -#include "netsurf/desktop/gui.h" -#include "netsurf/render/html.h" -#include "netsurf/render/box.h" -#include "netsurf/riscos/gui.h" -#include "netsurf/riscos/options.h" -#include "netsurf/riscos/plugin.h" -#include "netsurf/riscos/theme.h" -#include "netsurf/utils/log.h" -#include "netsurf/utils/messages.h" -#include "netsurf/utils/url.h" -#include "netsurf/utils/utils.h" +#include "utils/config.h" +#include "content/content.h" +#include "content/fetch.h" +#include "content/fetchcache.h" +#include "desktop/browser.h" +#include "desktop/gui.h" +#include "render/html.h" +#include "render/box.h" +#include "riscos/gui.h" +#include "riscos/options.h" +#include "riscos/plugin.h" +#include "riscos/theme.h" +#include "utils/log.h" +#include "utils/messages.h" +#include "utils/url.h" +#include "utils/utils.h" #ifdef WITH_PLUGIN diff --git a/riscos/plugin.h b/riscos/plugin.h index 63e79e597..aa6b976d6 100644 --- a/riscos/plugin.h +++ b/riscos/plugin.h @@ -9,8 +9,8 @@ #define _NETSURF_RISCOS_PLUGIN_H_ #include -#include "oslib/plugin.h" -#include "oslib/wimp.h" +#include +#include struct box; struct browser_window; diff --git a/riscos/print.c b/riscos/print.c index a95768b96..9d74f762a 100644 --- a/riscos/print.c +++ b/riscos/print.c @@ -15,21 +15,21 @@ #include "oslib/pdriver.h" #include "oslib/wimp.h" #include "rufl.h" -#include "netsurf/utils/config.h" -#include "netsurf/content/content.h" -#include "netsurf/desktop/plotters.h" -#include "netsurf/render/box.h" -#include "netsurf/render/font.h" -#include "netsurf/render/html.h" -#include "netsurf/render/layout.h" -#include "netsurf/riscos/dialog.h" -#include "netsurf/riscos/menus.h" -#include "netsurf/riscos/print.h" -#include "netsurf/riscos/wimp.h" -#include "netsurf/riscos/wimp_event.h" -#include "netsurf/utils/log.h" -#include "netsurf/utils/messages.h" -#include "netsurf/utils/utils.h" +#include "utils/config.h" +#include "content/content.h" +#include "desktop/plotters.h" +#include "render/box.h" +#include "render/font.h" +#include "render/html.h" +#include "render/layout.h" +#include "riscos/dialog.h" +#include "riscos/menus.h" +#include "riscos/print.h" +#include "riscos/wimp.h" +#include "riscos/wimp_event.h" +#include "utils/log.h" +#include "utils/messages.h" +#include "utils/utils.h" #define ICON_PRINT_TO_BOTTOM 1 diff --git a/riscos/query.c b/riscos/query.c index 578c32eb5..e9c316eee 100644 --- a/riscos/query.c +++ b/riscos/query.c @@ -9,14 +9,14 @@ #include #include -#include "netsurf/riscos/dialog.h" -#include "netsurf/riscos/query.h" -#include "netsurf/riscos/wimp.h" -#include "netsurf/riscos/wimp_event.h" -#include "netsurf/utils/log.h" -#include "netsurf/utils/messages.h" -#include "netsurf/utils/utf8.h" -#include "netsurf/utils/utils.h" +#include "riscos/dialog.h" +#include "riscos/query.h" +#include "riscos/wimp.h" +#include "riscos/wimp_event.h" +#include "utils/log.h" +#include "utils/messages.h" +#include "utils/utf8.h" +#include "utils/utils.h" #define ICON_QUERY_MESSAGE 0 #define ICON_QUERY_YES 1 diff --git a/riscos/query.h b/riscos/query.h index 28dc0e0f2..d6fdfff15 100644 --- a/riscos/query.h +++ b/riscos/query.h @@ -9,7 +9,7 @@ #define _NETSURF_RISCOS_QUERY_H #include #include "oslib/wimp.h" -#include "netsurf/utils/utils.h" +#include "utils/utils.h" struct gui_query_window; diff --git a/riscos/save.c b/riscos/save.c index 2acb7bbc4..aca013a41 100644 --- a/riscos/save.c +++ b/riscos/save.c @@ -21,30 +21,30 @@ #include "oslib/osbyte.h" #include "oslib/osfile.h" #include "oslib/osmodule.h" -#include "oslib/osspriteop.h" +#include #include "oslib/wimp.h" #include "oslib/wimpspriteop.h" -#include "netsurf/desktop/netsurf.h" -#include "netsurf/desktop/save_text.h" -#include "netsurf/desktop/selection.h" -#include "netsurf/image/bitmap.h" -#include "netsurf/riscos/dialog.h" -#include "netsurf/riscos/gui.h" -#include "netsurf/riscos/menus.h" -#include "netsurf/riscos/options.h" -#include "netsurf/riscos/save.h" -#include "netsurf/riscos/save_complete.h" -#include "netsurf/riscos/save_draw.h" -#include "netsurf/riscos/textselection.h" -#include "netsurf/riscos/thumbnail.h" -#include "netsurf/riscos/wimp.h" -#include "netsurf/riscos/wimp_event.h" -#include "netsurf/utils/config.h" -#include "netsurf/utils/log.h" -#include "netsurf/utils/messages.h" -#include "netsurf/utils/url.h" -#include "netsurf/utils/utf8.h" -#include "netsurf/utils/utils.h" +#include "desktop/netsurf.h" +#include "desktop/save_text.h" +#include "desktop/selection.h" +#include "image/bitmap.h" +#include "riscos/dialog.h" +#include "riscos/gui.h" +#include "riscos/menus.h" +#include "riscos/options.h" +#include "riscos/save.h" +#include "riscos/save_complete.h" +#include "riscos/save_draw.h" +#include "riscos/textselection.h" +#include "riscos/thumbnail.h" +#include "riscos/wimp.h" +#include "riscos/wimp_event.h" +#include "utils/config.h" +#include "utils/log.h" +#include "utils/messages.h" +#include "utils/url.h" +#include "utils/utf8.h" +#include "utils/utils.h" static gui_save_type gui_save_current_type; diff --git a/riscos/save.h b/riscos/save.h index b09ec5ef0..d37b946b3 100644 --- a/riscos/save.h +++ b/riscos/save.h @@ -13,7 +13,7 @@ #define _NETSURF_RISCOS_SAVE_H_ #include "oslib/wimp.h" -#include "netsurf/desktop/gui.h" +#include "desktop/gui.h" wimp_w ro_gui_saveas_create(const char *template_name); diff --git a/riscos/save_complete.c b/riscos/save_complete.c index 79c521ac7..9a8c103a4 100644 --- a/riscos/save_complete.c +++ b/riscos/save_complete.c @@ -17,18 +17,18 @@ #include #include #include -#include "libxml/HTMLtree.h" -#include "libxml/parserInternals.h" -#include "oslib/osfile.h" -#include "netsurf/utils/config.h" -#include "netsurf/content/content.h" -#include "netsurf/css/css.h" -#include "netsurf/render/box.h" -#include "netsurf/riscos/gui.h" -#include "netsurf/riscos/save_complete.h" -#include "netsurf/utils/log.h" -#include "netsurf/utils/url.h" -#include "netsurf/utils/utils.h" +#include +#include +#include +#include "utils/config.h" +#include "content/content.h" +#include "css/css.h" +#include "render/box.h" +#include "riscos/gui.h" +#include "riscos/save_complete.h" +#include "utils/log.h" +#include "utils/url.h" +#include "utils/utils.h" #ifdef WITH_SAVE_COMPLETE diff --git a/riscos/save_draw.c b/riscos/save_draw.c index eb96cf70c..4871b2d98 100644 --- a/riscos/save_draw.c +++ b/riscos/save_draw.c @@ -16,13 +16,13 @@ #include #include #include -#include "netsurf/content/content.h" -#include "netsurf/desktop/plotters.h" -#include "netsurf/riscos/bitmap.h" -#include "netsurf/riscos/gui.h" -#include "netsurf/riscos/save_draw.h" -#include "netsurf/utils/log.h" -#include "netsurf/utils/utils.h" +#include "content/content.h" +#include "desktop/plotters.h" +#include "riscos/bitmap.h" +#include "riscos/gui.h" +#include "riscos/save_draw.h" +#include "utils/log.h" +#include "utils/utils.h" static bool ro_save_draw_clg(colour c); diff --git a/riscos/schedule.c b/riscos/schedule.c index 50e949470..024fcb5c6 100644 --- a/riscos/schedule.c +++ b/riscos/schedule.c @@ -14,8 +14,8 @@ #include #include #include "oslib/os.h" -#include "netsurf/riscos/gui.h" -#include "netsurf/utils/log.h" +#include "riscos/gui.h" +#include "utils/log.h" /** Entry in the queue of scheduled callbacks. */ diff --git a/riscos/search.c b/riscos/search.c index 4fc5b04bd..3f70fff01 100644 --- a/riscos/search.c +++ b/riscos/search.c @@ -16,20 +16,20 @@ #include "oslib/hourglass.h" #include "oslib/wimp.h" -#include "netsurf/utils/config.h" -#include "netsurf/content/content.h" -#include "netsurf/desktop/browser.h" -#include "netsurf/desktop/gui.h" -#include "netsurf/desktop/selection.h" -#include "netsurf/render/box.h" -#include "netsurf/render/html.h" -#include "netsurf/riscos/dialog.h" -#include "netsurf/riscos/menus.h" -#include "netsurf/riscos/wimp.h" -#include "netsurf/riscos/wimp_event.h" -#include "netsurf/utils/log.h" -#include "netsurf/utils/messages.h" -#include "netsurf/utils/utils.h" +#include "utils/config.h" +#include "content/content.h" +#include "desktop/browser.h" +#include "desktop/gui.h" +#include "desktop/selection.h" +#include "render/box.h" +#include "render/html.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" #ifdef WITH_SEARCH diff --git a/riscos/sprite.c b/riscos/sprite.c index c17cd1a57..7cd3d6a5f 100644 --- a/riscos/sprite.c +++ b/riscos/sprite.c @@ -17,16 +17,16 @@ #include #include -#include "oslib/osspriteop.h" -#include "netsurf/utils/config.h" -#include "netsurf/desktop/plotters.h" -#include "netsurf/content/content.h" -#include "netsurf/riscos/gui.h" -#include "netsurf/riscos/image.h" -#include "netsurf/riscos/sprite.h" -#include "netsurf/utils/log.h" -#include "netsurf/utils/messages.h" -#include "netsurf/utils/utils.h" +#include +#include "utils/config.h" +#include "desktop/plotters.h" +#include "content/content.h" +#include "riscos/gui.h" +#include "riscos/image.h" +#include "riscos/sprite.h" +#include "utils/log.h" +#include "utils/messages.h" +#include "utils/utils.h" #ifdef WITH_SPRITE diff --git a/riscos/sprite.h b/riscos/sprite.h index 0707871dc..f4793f474 100644 --- a/riscos/sprite.h +++ b/riscos/sprite.h @@ -13,7 +13,7 @@ #define _NETSURF_RISCOS_SPRITE_H_ #include -#include "oslib/osspriteop.h" +#include struct content; diff --git a/riscos/sslcert.c b/riscos/sslcert.c index 650babab6..d12405e3e 100644 --- a/riscos/sslcert.c +++ b/riscos/sslcert.c @@ -9,7 +9,7 @@ * SSL Certificate verification UI (implementation) */ -#include "netsurf/utils/config.h" +#include "utils/config.h" #ifdef WITH_SSL @@ -18,19 +18,19 @@ #include #include #include "oslib/wimp.h" -#include "netsurf/content/content.h" -#include "netsurf/content/fetch.h" -#include "netsurf/content/urldb.h" -#include "netsurf/desktop/browser.h" -#include "netsurf/desktop/gui.h" -#include "netsurf/desktop/tree.h" -#include "netsurf/riscos/dialog.h" -#include "netsurf/riscos/textarea.h" -#include "netsurf/riscos/treeview.h" -#include "netsurf/riscos/wimp_event.h" -#include "netsurf/riscos/wimp.h" -#include "netsurf/utils/log.h" -#include "netsurf/utils/utils.h" +#include "content/content.h" +#include "content/fetch.h" +#include "content/urldb.h" +#include "desktop/browser.h" +#include "desktop/gui.h" +#include "desktop/tree.h" +#include "riscos/dialog.h" +#include "riscos/textarea.h" +#include "riscos/treeview.h" +#include "riscos/wimp_event.h" +#include "riscos/wimp.h" +#include "utils/log.h" +#include "utils/utils.h" #define ICON_SSL_PANE 1 #define ICON_SSL_REJECT 3 diff --git a/riscos/textarea.c b/riscos/textarea.c index ca0112d9c..191c6911e 100644 --- a/riscos/textarea.c +++ b/riscos/textarea.c @@ -23,13 +23,13 @@ #include "rufl.h" -#include "netsurf/riscos/gui.h" -#include "netsurf/riscos/textarea.h" -#include "netsurf/riscos/ucstables.h" -#include "netsurf/riscos/wimp.h" -#include "netsurf/riscos/wimp_event.h" -#include "netsurf/utils/log.h" -#include "netsurf/utils/utf8.h" +#include "riscos/gui.h" +#include "riscos/textarea.h" +#include "riscos/ucstables.h" +#include "riscos/wimp.h" +#include "riscos/wimp_event.h" +#include "utils/log.h" +#include "utils/utf8.h" #define MARGIN_LEFT 8 #define MARGIN_RIGHT 8 diff --git a/riscos/textselection.c b/riscos/textselection.c index 25bbc7f81..11f4a82be 100644 --- a/riscos/textselection.c +++ b/riscos/textselection.c @@ -14,17 +14,17 @@ #include #include "oslib/osfile.h" #include "oslib/wimp.h" -#include "netsurf/desktop/gui.h" -#include "netsurf/desktop/selection.h" -#include "netsurf/desktop/textinput.h" -#include "netsurf/riscos/gui.h" -#include "netsurf/riscos/message.h" -#include "netsurf/riscos/save.h" -#include "netsurf/riscos/textselection.h" -#include "netsurf/render/form.h" -#include "netsurf/utils/log.h" -#include "netsurf/utils/utf8.h" -#include "netsurf/utils/utils.h" +#include "desktop/gui.h" +#include "desktop/selection.h" +#include "desktop/textinput.h" +#include "riscos/gui.h" +#include "riscos/message.h" +#include "riscos/save.h" +#include "riscos/textselection.h" +#include "render/form.h" +#include "utils/log.h" +#include "utils/utf8.h" +#include "utils/utils.h" #ifndef wimp_DRAG_CLAIM_SUPPRESS_DRAGBOX #define wimp_DRAG_CLAIM_SUPPRESS_DRAGBOX ((wimp_drag_claim_flags) 0x2u) diff --git a/riscos/textselection.h b/riscos/textselection.h index 5576ff1f6..a701d904e 100644 --- a/riscos/textselection.h +++ b/riscos/textselection.h @@ -13,7 +13,7 @@ #define _NETSURF_RISCOS_TEXTSELECTION_H_ #include "oslib/wimp.h" -#include "netsurf/desktop/gui.h" +#include "desktop/gui.h" void ro_gui_selection_drag_end(struct gui_window *g, wimp_dragged *drag); diff --git a/riscos/theme.c b/riscos/theme.c index 3eac01944..0d35a581a 100644 --- a/riscos/theme.c +++ b/riscos/theme.c @@ -19,23 +19,23 @@ #include "oslib/osgbpb.h" #include "oslib/osfile.h" #include "oslib/osfind.h" -#include "oslib/osspriteop.h" +#include #include "oslib/wimpspriteop.h" #include "oslib/squash.h" #include "oslib/wimp.h" #include "oslib/wimpextend.h" #include "oslib/wimpspriteop.h" -#include "netsurf/desktop/gui.h" -#include "netsurf/riscos/dialog.h" -#include "netsurf/riscos/gui.h" -#include "netsurf/riscos/menus.h" -#include "netsurf/riscos/options.h" -#include "netsurf/riscos/theme.h" -#include "netsurf/riscos/treeview.h" -#include "netsurf/riscos/wimp.h" -#include "netsurf/riscos/wimp_event.h" -#include "netsurf/utils/log.h" -#include "netsurf/utils/utils.h" +#include "desktop/gui.h" +#include "riscos/dialog.h" +#include "riscos/gui.h" +#include "riscos/menus.h" +#include "riscos/options.h" +#include "riscos/theme.h" +#include "riscos/treeview.h" +#include "riscos/wimp.h" +#include "riscos/wimp_event.h" +#include "utils/log.h" +#include "utils/utils.h" #define THEME_URL_MEMORY 256 #define THEME_THROBBER_MEMORY 12 diff --git a/riscos/theme_install.c b/riscos/theme_install.c index f8f1c43af..5f57ec8f4 100644 --- a/riscos/theme_install.c +++ b/riscos/theme_install.c @@ -12,18 +12,18 @@ #include #include #include "oslib/osfile.h" -#include "netsurf/content/content.h" -#include "netsurf/desktop/browser.h" -#include "netsurf/riscos/dialog.h" -#include "netsurf/riscos/gui.h" -#include "netsurf/riscos/options.h" -#include "netsurf/riscos/theme.h" -#include "netsurf/riscos/wimp.h" -#include "netsurf/riscos/wimp_event.h" -#include "netsurf/utils/log.h" -#include "netsurf/utils/messages.h" -#include "netsurf/utils/url.h" -#include "netsurf/utils/utils.h" +#include "content/content.h" +#include "desktop/browser.h" +#include "riscos/dialog.h" +#include "riscos/gui.h" +#include "riscos/options.h" +#include "riscos/theme.h" +#include "riscos/wimp.h" +#include "riscos/wimp_event.h" +#include "utils/log.h" +#include "utils/messages.h" +#include "utils/url.h" +#include "utils/utils.h" static struct content *theme_install_content = NULL; diff --git a/riscos/thumbnail.c b/riscos/thumbnail.c index 99c888168..7227f64cc 100644 --- a/riscos/thumbnail.c +++ b/riscos/thumbnail.c @@ -19,18 +19,18 @@ #include "rufl.h" #include "oslib/colourtrans.h" #include "oslib/osfile.h" -#include "oslib/osspriteop.h" -#include "netsurf/content/content.h" -#include "netsurf/content/urldb.h" -#include "netsurf/desktop/plotters.h" -#include "netsurf/image/bitmap.h" -#include "netsurf/render/font.h" -#include "netsurf/riscos/bitmap.h" -#include "netsurf/riscos/gui.h" -#include "netsurf/riscos/options.h" -#include "netsurf/riscos/thumbnail.h" -#include "netsurf/riscos/tinct.h" -#include "netsurf/utils/log.h" +#include +#include "content/content.h" +#include "content/urldb.h" +#include "desktop/plotters.h" +#include "image/bitmap.h" +#include "render/font.h" +#include "riscos/bitmap.h" +#include "riscos/gui.h" +#include "riscos/options.h" +#include "riscos/thumbnail.h" +#include "riscos/tinct.h" +#include "utils/log.h" /* Whether we can use 32bpp sprites diff --git a/riscos/thumbnail.h b/riscos/thumbnail.h index b7b07545e..a3fc5aa37 100644 --- a/riscos/thumbnail.h +++ b/riscos/thumbnail.h @@ -10,7 +10,7 @@ * Page thumbnail creation (interface). */ -#include "oslib/osspriteop.h" -#include "netsurf/image/bitmap.h" +#include +#include "image/bitmap.h" osspriteop_area *thumbnail_convert_8bpp(struct bitmap *bitmap); diff --git a/riscos/treeview.c b/riscos/treeview.c index 65d04ea31..3086f436b 100644 --- a/riscos/treeview.c +++ b/riscos/treeview.c @@ -19,26 +19,26 @@ #include "oslib/colourtrans.h" #include "oslib/dragasprite.h" #include "oslib/osbyte.h" -#include "oslib/osspriteop.h" +#include #include "oslib/wimp.h" -#include "netsurf/content/urldb.h" -#include "netsurf/desktop/browser.h" -#include "netsurf/desktop/plotters.h" -#include "netsurf/desktop/tree.h" -#include "netsurf/riscos/bitmap.h" -#include "netsurf/riscos/dialog.h" -#include "netsurf/riscos/gui.h" -#include "netsurf/riscos/image.h" -#include "netsurf/riscos/menus.h" -#include "netsurf/riscos/theme.h" -#include "netsurf/riscos/tinct.h" -#include "netsurf/riscos/textarea.h" -#include "netsurf/riscos/treeview.h" -#include "netsurf/riscos/wimp.h" -#include "netsurf/riscos/wimp_event.h" -#include "netsurf/utils/log.h" -#include "netsurf/utils/messages.h" -#include "netsurf/utils/utils.h" +#include "content/urldb.h" +#include "desktop/browser.h" +#include "desktop/plotters.h" +#include "desktop/tree.h" +#include "riscos/bitmap.h" +#include "riscos/dialog.h" +#include "riscos/gui.h" +#include "riscos/image.h" +#include "riscos/menus.h" +#include "riscos/theme.h" +#include "riscos/tinct.h" +#include "riscos/textarea.h" +#include "riscos/treeview.h" +#include "riscos/wimp.h" +#include "riscos/wimp_event.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/treeview.h b/riscos/treeview.h index 8413dcfd5..3394d10ae 100644 --- a/riscos/treeview.h +++ b/riscos/treeview.h @@ -13,10 +13,10 @@ #define _NETSURF_RISCOS_TREEVIEW_H_ #include -#include "oslib/osspriteop.h" +#include #include "oslib/wimp.h" -#include "netsurf/desktop/tree.h" -#include "netsurf/image/bitmap.h" +#include "desktop/tree.h" +#include "image/bitmap.h" #define TREE_TEXT_HEIGHT 40 #define TREE_SPRITE_WIDTH 40 /* text plus sprite entries only */ diff --git a/riscos/ucstables.c b/riscos/ucstables.c index a468cd178..073814ca0 100644 --- a/riscos/ucstables.c +++ b/riscos/ucstables.c @@ -17,10 +17,10 @@ #include "oslib/osbyte.h" #include "oslib/territory.h" -#include "netsurf/riscos/ucstables.h" -#include "netsurf/utils/log.h" -#include "netsurf/utils/utf8.h" -#include "netsurf/utils/utils.h" +#include "riscos/ucstables.h" +#include "utils/log.h" +#include "utils/utf8.h" +#include "utils/utils.h" /* Common values (ASCII) */ #define common \ diff --git a/riscos/uri.c b/riscos/uri.c index 35ba06898..9db177c0e 100644 --- a/riscos/uri.c +++ b/riscos/uri.c @@ -11,15 +11,15 @@ #include #include "oslib/uri.h" #include "oslib/wimp.h" -#include "netsurf/utils/config.h" -#include "netsurf/content/fetch.h" -#include "netsurf/desktop/browser.h" -#include "netsurf/riscos/theme.h" -#include "netsurf/desktop/gui.h" -#include "netsurf/riscos/gui.h" -#include "netsurf/riscos/url_protocol.h" -#include "netsurf/utils/log.h" -#include "netsurf/utils/utils.h" +#include "utils/config.h" +#include "content/fetch.h" +#include "desktop/browser.h" +#include "riscos/theme.h" +#include "desktop/gui.h" +#include "riscos/gui.h" +#include "riscos/url_protocol.h" +#include "utils/log.h" +#include "utils/utils.h" #ifdef WITH_URI diff --git a/riscos/url_complete.c b/riscos/url_complete.c index 44614efc9..5cd8393d8 100644 --- a/riscos/url_complete.c +++ b/riscos/url_complete.c @@ -16,16 +16,16 @@ #include #include #include "oslib/wimp.h" -#include "netsurf/content/urldb.h" -#include "netsurf/utils/log.h" -#include "netsurf/riscos/global_history.h" -#include "netsurf/riscos/gui.h" -#include "netsurf/riscos/options.h" -#include "netsurf/riscos/theme.h" -#include "netsurf/riscos/url_complete.h" -#include "netsurf/riscos/wimp.h" -#include "netsurf/riscos/wimp_event.h" -#include "netsurf/utils/utils.h" +#include "content/urldb.h" +#include "utils/log.h" +#include "riscos/global_history.h" +#include "riscos/gui.h" +#include "riscos/options.h" +#include "riscos/theme.h" +#include "riscos/url_complete.h" +#include "riscos/wimp.h" +#include "riscos/wimp_event.h" +#include "utils/utils.h" #define MAXIMUM_VISIBLE_LINES 7 diff --git a/riscos/url_protocol.c b/riscos/url_protocol.c index 101c3e19e..d67b2cb69 100644 --- a/riscos/url_protocol.c +++ b/riscos/url_protocol.c @@ -19,15 +19,15 @@ #include #include "oslib/inetsuite.h" #include "oslib/wimp.h" -#include "netsurf/utils/config.h" -#include "netsurf/content/fetch.h" -#include "netsurf/desktop/browser.h" -#include "netsurf/desktop/gui.h" -#include "netsurf/riscos/gui.h" -#include "netsurf/riscos/uri.h" -#include "netsurf/riscos/url_protocol.h" -#include "netsurf/utils/log.h" -#include "netsurf/utils/utils.h" +#include "utils/config.h" +#include "content/fetch.h" +#include "desktop/browser.h" +#include "desktop/gui.h" +#include "riscos/gui.h" +#include "riscos/uri.h" +#include "riscos/url_protocol.h" +#include "utils/log.h" +#include "utils/utils.h" #ifdef WITH_URL diff --git a/riscos/wimp.c b/riscos/wimp.c index f6c6d2250..df47a7a1e 100644 --- a/riscos/wimp.c +++ b/riscos/wimp.c @@ -21,13 +21,13 @@ #include "oslib/wimp.h" #include "oslib/wimpextend.h" #include "oslib/wimpspriteop.h" -#include "netsurf/desktop/gui.h" -#include "netsurf/riscos/gui.h" -#include "netsurf/riscos/theme.h" -#include "netsurf/riscos/wimp.h" -#include "netsurf/utils/log.h" -#include "netsurf/utils/utf8.h" -#include "netsurf/utils/utils.h" +#include "desktop/gui.h" +#include "riscos/gui.h" +#include "riscos/theme.h" +#include "riscos/wimp.h" +#include "utils/log.h" +#include "utils/utf8.h" +#include "utils/utils.h" static void ro_gui_wimp_cache_furniture_sizes(wimp_w w); diff --git a/riscos/wimp_event.c b/riscos/wimp_event.c index 87ed789ff..c86231960 100644 --- a/riscos/wimp_event.c +++ b/riscos/wimp_event.c @@ -18,14 +18,14 @@ #include "oslib/osbyte.h" #include "oslib/serviceinternational.h" #include "oslib/wimp.h" -#include "netsurf/desktop/gui.h" -#include "netsurf/riscos/dialog.h" -#include "netsurf/riscos/menus.h" -#include "netsurf/riscos/ucstables.h" -#include "netsurf/riscos/wimp.h" -#include "netsurf/riscos/wimp_event.h" -#include "netsurf/utils/log.h" -#include "netsurf/utils/utils.h" +#include "desktop/gui.h" +#include "riscos/dialog.h" +#include "riscos/menus.h" +#include "riscos/ucstables.h" +#include "riscos/wimp.h" +#include "riscos/wimp_event.h" +#include "utils/log.h" +#include "utils/utils.h" #define WIN_HASH_SIZE 32 #define WIN_HASH(w) (((unsigned)(w) >> 5) % WIN_HASH_SIZE) diff --git a/riscos/window.c b/riscos/window.c index 7195064a0..fe7ffa315 100644 --- a/riscos/window.c +++ b/riscos/window.c @@ -24,42 +24,42 @@ #include "oslib/colourtrans.h" #include "oslib/osbyte.h" #include "oslib/osfile.h" -#include "oslib/osspriteop.h" +#include #include "oslib/wimp.h" #include "oslib/wimpspriteop.h" -#include "netsurf/utils/config.h" -#include "netsurf/content/content.h" -#include "netsurf/content/urldb.h" -#include "netsurf/css/css.h" -#include "netsurf/desktop/browser.h" -#include "netsurf/desktop/frames.h" -#include "netsurf/desktop/knockout.h" -#include "netsurf/desktop/plotters.h" -#include "netsurf/desktop/textinput.h" -#include "netsurf/desktop/tree.h" -#include "netsurf/desktop/gui.h" -#include "netsurf/render/box.h" -#include "netsurf/render/form.h" -#include "netsurf/riscos/bitmap.h" -#include "netsurf/riscos/buffer.h" -#include "netsurf/riscos/dialog.h" -#include "netsurf/riscos/global_history.h" -#include "netsurf/riscos/gui.h" -#include "netsurf/riscos/gui/status_bar.h" -#include "netsurf/riscos/menus.h" -#include "netsurf/riscos/options.h" -#include "netsurf/riscos/save.h" -#include "netsurf/riscos/theme.h" -#include "netsurf/riscos/thumbnail.h" -#include "netsurf/riscos/url_complete.h" -#include "netsurf/riscos/wimp.h" -#include "netsurf/riscos/wimp_event.h" -#include "netsurf/utils/log.h" -#include "netsurf/utils/talloc.h" -#include "netsurf/utils/url.h" -#include "netsurf/utils/utf8.h" -#include "netsurf/utils/utils.h" -#include "netsurf/utils/messages.h" +#include "utils/config.h" +#include "content/content.h" +#include "content/urldb.h" +#include "css/css.h" +#include "desktop/browser.h" +#include "desktop/frames.h" +#include "desktop/knockout.h" +#include "desktop/plotters.h" +#include "desktop/textinput.h" +#include "desktop/tree.h" +#include "desktop/gui.h" +#include "render/box.h" +#include "render/form.h" +#include "riscos/bitmap.h" +#include "riscos/buffer.h" +#include "riscos/dialog.h" +#include "riscos/global_history.h" +#include "riscos/gui.h" +#include "riscos/gui/status_bar.h" +#include "riscos/menus.h" +#include "riscos/options.h" +#include "riscos/save.h" +#include "riscos/theme.h" +#include "riscos/thumbnail.h" +#include "riscos/url_complete.h" +#include "riscos/wimp.h" +#include "riscos/wimp_event.h" +#include "utils/log.h" +#include "utils/talloc.h" +#include "utils/url.h" +#include "utils/utf8.h" +#include "utils/utils.h" +#include "utils/messages.h" #ifndef wimp_KEY_END #define wimp_KEY_END wimp_KEY_COPY -- cgit v1.2.3