diff options
Diffstat (limited to 'riscos')
34 files changed, 35 insertions, 35 deletions
diff --git a/riscos/bitmap.c b/riscos/bitmap.c index d7836822a..0af01c91e 100644 --- a/riscos/bitmap.c +++ b/riscos/bitmap.c @@ -39,7 +39,7 @@ #include "image/bitmap.h" #include "riscos/bitmap.h" #include "riscos/image.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "riscos/palettes.h" #include "riscos/content-handlers/sprite.h" #include "riscos/tinct.h" diff --git a/riscos/buffer.c b/riscos/buffer.c index 6eec8bf7e..a1b99f493 100644 --- a/riscos/buffer.c +++ b/riscos/buffer.c @@ -27,7 +27,7 @@ #include "oslib/wimpreadsysinfo.h" #include "riscos/buffer.h" #include "riscos/gui.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "riscos/tinct.h" #include "riscos/wimp.h" #include "riscos/wimputils.h" diff --git a/riscos/configure/con_cache.c b/riscos/configure/con_cache.c index cd211236e..6e402fe81 100644 --- a/riscos/configure/con_cache.c +++ b/riscos/configure/con_cache.c @@ -18,7 +18,7 @@ #include <stdbool.h> #include "oslib/hourglass.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "riscos/dialog.h" #include "riscos/gui.h" #include "riscos/wimp.h" diff --git a/riscos/configure/con_connect.c b/riscos/configure/con_connect.c index c47e90419..d9919d084 100644 --- a/riscos/configure/con_connect.c +++ b/riscos/configure/con_connect.c @@ -20,7 +20,7 @@ #include "swis.h" #include "oslib/osspriteop.h" #include "oslib/wimp.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "riscos/configure/configure.h" #include "riscos/dialog.h" #include "riscos/menus.h" diff --git a/riscos/configure/con_content.c b/riscos/configure/con_content.c index 81537bcef..122b0e3a5 100644 --- a/riscos/configure/con_content.c +++ b/riscos/configure/con_content.c @@ -17,7 +17,7 @@ */ #include <stdbool.h> -#include "desktop/options.h" +#include "utils/nsoption.h" #include "riscos/dialog.h" #include "riscos/gui.h" #include "riscos/wimp.h" diff --git a/riscos/configure/con_fonts.c b/riscos/configure/con_fonts.c index 0bd13ce2a..626115523 100644 --- a/riscos/configure/con_fonts.c +++ b/riscos/configure/con_fonts.c @@ -18,7 +18,7 @@ #include <stdbool.h> #include "css/css.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "desktop/plot_style.h" #include "riscos/dialog.h" #include "riscos/gui.h" diff --git a/riscos/configure/con_home.c b/riscos/configure/con_home.c index 9e966b96e..6f7d01043 100644 --- a/riscos/configure/con_home.c +++ b/riscos/configure/con_home.c @@ -17,7 +17,7 @@ */ #include <stdbool.h> -#include "desktop/options.h" +#include "utils/nsoption.h" #include "riscos/dialog.h" #include "riscos/gui.h" #include "riscos/menus.h" diff --git a/riscos/configure/con_image.c b/riscos/configure/con_image.c index 8617e6d2e..147f5d684 100644 --- a/riscos/configure/con_image.c +++ b/riscos/configure/con_image.c @@ -20,7 +20,7 @@ #include "swis.h" #include "oslib/osspriteop.h" #include "oslib/wimp.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "riscos/configure/configure.h" #include "riscos/dialog.h" #include "riscos/menus.h" diff --git a/riscos/configure/con_inter.c b/riscos/configure/con_inter.c index be2114b05..2af5e3aa5 100644 --- a/riscos/configure/con_inter.c +++ b/riscos/configure/con_inter.c @@ -19,7 +19,7 @@ #include <stdbool.h> #include "riscos/dialog.h" #include "riscos/gui.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "riscos/wimp.h" #include "riscos/wimp_event.h" #include "riscos/configure.h" diff --git a/riscos/configure/con_language.c b/riscos/configure/con_language.c index be40b1c39..7e483b5af 100644 --- a/riscos/configure/con_language.c +++ b/riscos/configure/con_language.c @@ -18,7 +18,7 @@ */ #include <stdbool.h> -#include "desktop/options.h" +#include "utils/nsoption.h" #include "riscos/dialog.h" #include "riscos/gui.h" #include "riscos/menus.h" diff --git a/riscos/configure/con_memory.c b/riscos/configure/con_memory.c index 5bf890597..273684959 100644 --- a/riscos/configure/con_memory.c +++ b/riscos/configure/con_memory.c @@ -17,7 +17,7 @@ */ #include <stdbool.h> -#include "desktop/options.h" +#include "utils/nsoption.h" #include "riscos/bitmap.h" #include "riscos/wimp.h" #include "riscos/wimp_event.h" diff --git a/riscos/configure/con_secure.c b/riscos/configure/con_secure.c index 568a03ddd..75e2bc705 100644 --- a/riscos/configure/con_secure.c +++ b/riscos/configure/con_secure.c @@ -17,7 +17,7 @@ */ #include <stdbool.h> -#include "desktop/options.h" +#include "utils/nsoption.h" #include "riscos/dialog.h" #include "riscos/gui.h" #include "riscos/wimp.h" diff --git a/riscos/configure/con_theme.c b/riscos/configure/con_theme.c index b41484be0..c4d605c88 100644 --- a/riscos/configure/con_theme.c +++ b/riscos/configure/con_theme.c @@ -23,7 +23,7 @@ #include "oslib/wimp.h" #include "oslib/wimpspriteop.h" #include "utils/config.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "riscos/configure/configure.h" #include "riscos/configure.h" #include "riscos/dialog.h" diff --git a/riscos/cookies.c b/riscos/cookies.c index 347b43d0e..8fb45947f 100644 --- a/riscos/cookies.c +++ b/riscos/cookies.c @@ -35,7 +35,7 @@ #include "riscos/cookies.h" #include "riscos/dialog.h" #include "riscos/menus.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "riscos/toolbar.h" #include "riscos/treeview.h" #include "riscos/wimp.h" diff --git a/riscos/dialog.c b/riscos/dialog.c index 5e4bbbf23..b00aee687 100644 --- a/riscos/dialog.c +++ b/riscos/dialog.c @@ -41,7 +41,7 @@ #include "riscos/gui.h" #include "riscos/hotlist.h" #include "riscos/menus.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "riscos/save.h" #include "riscos/sslcert.h" #include "riscos/toolbar.h" diff --git a/riscos/download.c b/riscos/download.c index 233d19300..089714c11 100644 --- a/riscos/download.c +++ b/riscos/download.c @@ -44,7 +44,7 @@ #include "desktop/gui.h" #include "desktop/netsurf.h" #include "riscos/dialog.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "riscos/save.h" #include "riscos/query.h" #include "riscos/wimp.h" diff --git a/riscos/font.c b/riscos/font.c index b949a570d..68ee6b636 100644 --- a/riscos/font.c +++ b/riscos/font.c @@ -31,7 +31,7 @@ #include "css/utils.h" #include "render/font.h" #include "riscos/gui.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "utils/log.h" #include "utils/messages.h" #include "utils/utils.h" diff --git a/riscos/global_history.c b/riscos/global_history.c index ca51b7253..8eeb924ac 100644 --- a/riscos/global_history.c +++ b/riscos/global_history.c @@ -36,7 +36,7 @@ #include "riscos/global_history.h" #include "riscos/gui.h" #include "riscos/menus.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "riscos/save.h" #include "riscos/toolbar.h" #include "riscos/treeview.h" diff --git a/riscos/gui.c b/riscos/gui.c index bca2a701a..50ccceff9 100644 --- a/riscos/gui.c +++ b/riscos/gui.c @@ -60,7 +60,7 @@ #include "desktop/history_global_core.h" #include "desktop/hotlist.h" #include "desktop/netsurf.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "desktop/save_complete.h" #include "desktop/sslcert.h" #include "desktop/tree.h" @@ -328,7 +328,7 @@ nsurl *gui_get_resource_url(const char *path) return url; } -/* Documented in desktop/options.h */ +/* Documented in utils/nsoption.h */ void gui_options_init_defaults(void) { /* Set defaults for absent option strings */ diff --git a/riscos/help.c b/riscos/help.c index ae2a2af84..14d34af15 100644 --- a/riscos/help.c +++ b/riscos/help.c @@ -35,7 +35,7 @@ #include "riscos/help.h" #include "riscos/iconbar.h" #include "riscos/menus.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "riscos/treeview.h" #include "riscos/wimp.h" #include "riscos/wimp_event.h" diff --git a/riscos/history.c b/riscos/history.c index 8a3b562cb..65ae84758 100644 --- a/riscos/history.c +++ b/riscos/history.c @@ -31,7 +31,7 @@ #include "desktop/plotters.h" #include "riscos/dialog.h" #include "desktop/browser_private.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "riscos/gui.h" #include "riscos/wimp.h" #include "riscos/wimp_event.h" diff --git a/riscos/hotlist.c b/riscos/hotlist.c index 53212c12f..b8449cd21 100644 --- a/riscos/hotlist.c +++ b/riscos/hotlist.c @@ -39,7 +39,7 @@ #include "riscos/hotlist.h" #include "riscos/menus.h" #include "riscos/message.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "riscos/save.h" #include "riscos/toolbar.h" #include "riscos/treeview.h" diff --git a/riscos/iconbar.c b/riscos/iconbar.c index 6c7996aa3..f6c094291 100644 --- a/riscos/iconbar.c +++ b/riscos/iconbar.c @@ -38,7 +38,7 @@ #include "riscos/hotlist.h" #include "riscos/iconbar.h" #include "desktop/browser.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "riscos/wimp_event.h" #include "utils/log.h" #include "utils/messages.h" diff --git a/riscos/image.c b/riscos/image.c index 3d4f28b1d..ae2534f4c 100644 --- a/riscos/image.c +++ b/riscos/image.c @@ -22,7 +22,7 @@ #include "oslib/osspriteop.h" #include "riscos/image.h" #include "riscos/gui.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "riscos/tinct.h" #include "utils/log.h" #include "utils/utils.h" diff --git a/riscos/menus.c b/riscos/menus.c index 5c80fd976..aaec8cfb4 100644 --- a/riscos/menus.c +++ b/riscos/menus.c @@ -50,7 +50,7 @@ #include "riscos/help.h" #include "riscos/hotlist.h" #include "riscos/menus.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "riscos/save.h" #include "riscos/tinct.h" #include "riscos/toolbar.h" diff --git a/riscos/print.c b/riscos/print.c index 05eb8fdba..0df77ef6b 100644 --- a/riscos/print.c +++ b/riscos/print.c @@ -33,7 +33,7 @@ #include "content/content.h" #include "content/hlcache.h" #include "desktop/browser_private.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "desktop/plotters.h" #include "riscos/dialog.h" #include "riscos/menus.h" diff --git a/riscos/save.c b/riscos/save.c index 7ccbfb13f..390165d3b 100644 --- a/riscos/save.c +++ b/riscos/save.c @@ -49,7 +49,7 @@ #include "riscos/gui.h" #include "riscos/menus.h" #include "riscos/message.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "riscos/query.h" #include "riscos/save.h" #include "riscos/save_draw.h" diff --git a/riscos/system_colour.c b/riscos/system_colour.c index 104aa3bad..39a86ac30 100644 --- a/riscos/system_colour.c +++ b/riscos/system_colour.c @@ -26,7 +26,7 @@ #include "utils/utils.h" #include "utils/log.h" #include "desktop/gui.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "riscos/system_colour.h" struct gui_system_colour_ctx { diff --git a/riscos/theme.c b/riscos/theme.c index b44493dd9..f1b7ae249 100644 --- a/riscos/theme.c +++ b/riscos/theme.c @@ -44,7 +44,7 @@ #include "riscos/gui.h" #include "riscos/hotlist.h" #include "riscos/menus.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "riscos/theme.h" #include "riscos/treeview.h" #include "riscos/wimp.h" diff --git a/riscos/theme_install.c b/riscos/theme_install.c index e5d5aafa3..0d436dce8 100644 --- a/riscos/theme_install.c +++ b/riscos/theme_install.c @@ -28,7 +28,7 @@ #include "desktop/browser.h" #include "riscos/dialog.h" #include "riscos/gui.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "riscos/theme.h" #include "riscos/wimp.h" #include "riscos/wimp_event.h" diff --git a/riscos/thumbnail.c b/riscos/thumbnail.c index 2a140ce17..66864554b 100644 --- a/riscos/thumbnail.c +++ b/riscos/thumbnail.c @@ -40,7 +40,7 @@ #include "render/font.h" #include "riscos/bitmap.h" #include "riscos/gui.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "riscos/oslib_pre7.h" #include "riscos/thumbnail.h" #include "riscos/tinct.h" diff --git a/riscos/toolbar.c b/riscos/toolbar.c index 7e95ce6b0..d56c6fad2 100644 --- a/riscos/toolbar.c +++ b/riscos/toolbar.c @@ -49,7 +49,7 @@ #include "riscos/gui/url_bar.h" #include "riscos/hotlist.h" #include "riscos/menus.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "riscos/save.h" #include "riscos/theme.h" #include "riscos/toolbar.h" diff --git a/riscos/url_complete.c b/riscos/url_complete.c index 990ce4276..e26cb6556 100644 --- a/riscos/url_complete.c +++ b/riscos/url_complete.c @@ -30,7 +30,7 @@ #include "utils/log.h" #include "riscos/global_history.h" #include "riscos/gui.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "riscos/toolbar.h" #include "riscos/url_complete.h" #include "riscos/wimp.h" diff --git a/riscos/window.c b/riscos/window.c index 295315d2c..e7b3699b7 100644 --- a/riscos/window.c +++ b/riscos/window.c @@ -69,7 +69,7 @@ #include "riscos/help.h" #include "riscos/hotlist.h" #include "riscos/menus.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "riscos/oslib_pre7.h" #include "riscos/save.h" #include "riscos/content-handlers/sprite.h" |