From ee6e6eec050a38d9e795df86fa7a45ca313f8845 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Sat, 25 May 2013 22:46:27 +0100 Subject: move options include --- amiga/arexx.c | 2 +- amiga/bitmap.c | 2 +- amiga/clipboard.c | 2 +- amiga/context_menu.c | 2 +- amiga/download.c | 2 +- amiga/drag.c | 2 +- amiga/file.c | 2 +- amiga/font.c | 2 +- amiga/font_scan.c | 2 +- amiga/gui.c | 4 ++-- amiga/gui_options.c | 2 +- amiga/launch.c | 2 +- amiga/menu.c | 2 +- amiga/plotters.c | 2 +- amiga/print.c | 2 +- amiga/stringview/urlhistory.c | 2 +- amiga/system_colour.c | 2 +- amiga/theme.c | 2 +- amiga/thumbnail.c | 2 +- amiga/tree.c | 2 +- atari/bitmap.c | 2 +- atari/ctxmenu.c | 2 +- atari/deskmenu.c | 2 +- atari/download.c | 2 +- atari/font.c | 2 +- atari/gui.c | 4 ++-- atari/history.c | 2 +- atari/hotlist.c | 2 +- atari/misc.c | 2 +- atari/plot/font_freetype.c | 2 +- atari/plot/plot.c | 2 +- atari/settings.c | 2 +- atari/system_colour.c | 2 +- atari/toolbar.c | 2 +- beos/fetch_rsrc.cpp | 2 +- beos/font.cpp | 2 +- beos/gui.cpp | 4 ++-- beos/gui_options.cpp | 2 +- beos/plotters.cpp | 2 +- beos/scaffolding.cpp | 2 +- beos/system_colour.cpp | 2 +- beos/window.cpp | 2 +- cocoa/BrowserView.m | 2 +- cocoa/BrowserViewController.m | 2 +- cocoa/BrowserWindowController.m | 2 +- cocoa/NetSurfAppDelegate.m | 2 +- cocoa/NetsurfApp.m | 4 ++-- cocoa/PreferencesWindowController.m | 2 +- cocoa/font.m | 2 +- cocoa/gui.m | 2 +- cocoa/system_colour.m | 2 +- content/content.c | 2 +- content/fetch.c | 2 +- content/fetchers/about.c | 2 +- content/fetchers/curl.c | 2 +- content/fetchers/data.c | 2 +- content/fetchers/file.c | 2 +- content/fetchers/resource.c | 2 +- content/urldb.c | 2 +- css/select.c | 2 +- css/utils.c | 2 +- desktop/browser.c | 2 +- desktop/cookies.c | 2 +- desktop/netsurf.c | 2 +- desktop/options.c | 2 +- desktop/print.c | 2 +- desktop/save_pdf/font_haru.c | 2 +- desktop/save_pdf/pdf_plotters.c | 2 +- desktop/scrollbar.c | 2 +- desktop/search.c | 2 +- desktop/searchweb.c | 2 +- desktop/thumbnail.c | 2 +- desktop/tree.c | 2 +- desktop/tree_url_node.c | 2 +- framebuffer/font_freetype.c | 2 +- framebuffer/font_internal.c | 2 +- framebuffer/gui.c | 4 ++-- framebuffer/localhistory.c | 2 +- framebuffer/system_colour.c | 2 +- gtk/completion.c | 2 +- gtk/dialogs/preferences.c | 2 +- gtk/dialogs/source.c | 2 +- gtk/download.c | 2 +- gtk/font_pango.c | 2 +- gtk/gui.c | 4 ++-- gtk/hotlist.c | 2 +- gtk/plotters.c | 2 +- gtk/print.c | 2 +- gtk/scaffolding.c | 2 +- gtk/system_colour.c | 2 +- gtk/tabs.c | 2 +- gtk/theme.c | 2 +- gtk/window.c | 2 +- image/gif.c | 2 +- image/mng.c | 2 +- javascript/jsapi/navigator.bnd | 2 +- javascript/none.c | 2 +- monkey/font.c | 2 +- monkey/main.c | 4 ++-- monkey/system_colour.c | 2 +- render/box.c | 2 +- render/box_construct.c | 2 +- render/font.c | 2 +- render/html.c | 2 +- render/html_css.c | 2 +- render/html_interaction.c | 2 +- render/html_object.c | 2 +- render/html_redraw.c | 2 +- render/layout.c | 2 +- render/textplain.c | 2 +- riscos/bitmap.c | 2 +- riscos/buffer.c | 2 +- riscos/configure/con_cache.c | 2 +- riscos/configure/con_connect.c | 2 +- riscos/configure/con_content.c | 2 +- riscos/configure/con_fonts.c | 2 +- riscos/configure/con_home.c | 2 +- riscos/configure/con_image.c | 2 +- riscos/configure/con_inter.c | 2 +- riscos/configure/con_language.c | 2 +- riscos/configure/con_memory.c | 2 +- riscos/configure/con_secure.c | 2 +- riscos/configure/con_theme.c | 2 +- riscos/cookies.c | 2 +- riscos/dialog.c | 2 +- riscos/download.c | 2 +- riscos/font.c | 2 +- riscos/global_history.c | 2 +- riscos/gui.c | 4 ++-- riscos/help.c | 2 +- riscos/history.c | 2 +- riscos/hotlist.c | 2 +- riscos/iconbar.c | 2 +- riscos/image.c | 2 +- riscos/menus.c | 2 +- riscos/print.c | 2 +- riscos/save.c | 2 +- riscos/system_colour.c | 2 +- riscos/theme.c | 2 +- riscos/theme_install.c | 2 +- riscos/thumbnail.c | 2 +- riscos/toolbar.c | 2 +- riscos/url_complete.c | 2 +- riscos/window.c | 2 +- test/urldbtest.c | 2 +- windows/font.c | 2 +- windows/gui.c | 2 +- windows/main.c | 4 ++-- windows/prefs.c | 2 +- windows/system_colour.c | 2 +- 150 files changed, 159 insertions(+), 159 deletions(-) diff --git a/amiga/arexx.c b/amiga/arexx.c index 491fc03bd..5ff7792c0 100644 --- a/amiga/arexx.c +++ b/amiga/arexx.c @@ -23,7 +23,7 @@ #include "amiga/gui.h" #include "amiga/hotlist.h" #include "amiga/theme.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "desktop/browser_private.h" diff --git a/amiga/bitmap.c b/amiga/bitmap.c index c70212a1b..9a71d1cd4 100644 --- a/amiga/bitmap.c +++ b/amiga/bitmap.c @@ -28,7 +28,7 @@ #include #endif #include -#include "desktop/options.h" +#include "utils/nsoption.h" #include #include #include diff --git a/amiga/clipboard.c b/amiga/clipboard.c index 2a4f2ab56..d0772f1b0 100644 --- a/amiga/clipboard.c +++ b/amiga/clipboard.c @@ -19,7 +19,7 @@ #include "desktop/gui.h" #include "desktop/plotters.h" #include "desktop/textinput.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "amiga/bitmap.h" #include "amiga/clipboard.h" diff --git a/amiga/context_menu.c b/amiga/context_menu.c index db751da08..839b60334 100644 --- a/amiga/context_menu.c +++ b/amiga/context_menu.c @@ -34,7 +34,7 @@ #include "amiga/gui.h" #include "amiga/history_local.h" #include "amiga/iff_dr2d.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "amiga/plugin_hack.h" #include "amiga/theme.h" #include "amiga/tree.h" diff --git a/amiga/download.c b/amiga/download.c index f0a7d0939..6b0e3c8a0 100644 --- a/amiga/download.c +++ b/amiga/download.c @@ -34,7 +34,7 @@ #include "amiga/download.h" #include "amiga/icon.h" #include "amiga/object.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "amiga/bitmap.h" #include "amiga/iff_dr2d.h" #include "amiga/file.h" diff --git a/amiga/drag.c b/amiga/drag.c index c8b44165d..be4d4903d 100644 --- a/amiga/drag.c +++ b/amiga/drag.c @@ -37,7 +37,7 @@ #include "amiga/drag.h" #include "amiga/file.h" #include "amiga/filetype.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "amiga/theme.h" #include "utils/errors.h" diff --git a/amiga/file.c b/amiga/file.c index 74c7225d4..694285738 100644 --- a/amiga/file.c +++ b/amiga/file.c @@ -29,7 +29,7 @@ #include "content/fetch.h" #include "desktop/browser_private.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "desktop/save_complete.h" #include "desktop/save_pdf/pdf_plotters.h" #include "desktop/save_text.h" diff --git a/amiga/font.c b/amiga/font.c index 69afdbaf8..69001a28d 100755 --- a/amiga/font.c +++ b/amiga/font.c @@ -23,7 +23,7 @@ #include "amiga/gui.h" #include "amiga/utf8.h" #include "amiga/object.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "css/css.h" #include "css/utils.h" #include "render/font.h" diff --git a/amiga/font_scan.c b/amiga/font_scan.c index 768fceef9..b1732da3e 100644 --- a/amiga/font_scan.c +++ b/amiga/font_scan.c @@ -45,7 +45,7 @@ #include "amiga/object.h" #include "amiga/utf8.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "utils/log.h" #include "utils/messages.h" diff --git a/amiga/gui.c b/amiga/gui.c index 33cd1bcf9..8342b8dc7 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -23,7 +23,7 @@ #include "desktop/history_core.h" #include "desktop/mouse.h" #include "desktop/netsurf.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "desktop/save_complete.h" #include "desktop/scrollbar.h" #include "desktop/searchweb.h" @@ -553,7 +553,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/amiga/gui_options.c b/amiga/gui_options.c index 96ac2e416..bd37acd1e 100755 --- a/amiga/gui_options.c +++ b/amiga/gui_options.c @@ -38,7 +38,7 @@ #include "amiga/utf8.h" #include "utils/messages.h" #include "desktop/browser_private.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "desktop/searchweb.h" #include diff --git a/amiga/launch.c b/amiga/launch.c index 20505f3bc..3236e797b 100755 --- a/amiga/launch.c +++ b/amiga/launch.c @@ -30,7 +30,7 @@ #include #include -#include "desktop/options.h" +#include "utils/nsoption.h" #include "utils/url.h" struct Library *OpenURLBase = NULL; diff --git a/amiga/menu.c b/amiga/menu.c index 2c8f541bb..c7c3c4671 100644 --- a/amiga/menu.c +++ b/amiga/menu.c @@ -50,7 +50,7 @@ #include "amiga/history_local.h" #include "amiga/hotlist.h" #include "amiga/menu.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "amiga/print.h" #include "amiga/search.h" #include "amiga/theme.h" diff --git a/amiga/plotters.c b/amiga/plotters.c index 4d2983076..c8a5c206b 100755 --- a/amiga/plotters.c +++ b/amiga/plotters.c @@ -22,7 +22,7 @@ #include "amiga/gui.h" #include "amiga/utf8.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "utils/utils.h" #include "utils/log.h" diff --git a/amiga/print.c b/amiga/print.c index ec04c6229..f0689f73a 100644 --- a/amiga/print.c +++ b/amiga/print.c @@ -20,7 +20,7 @@ #include "amiga/plotters.h" #include "render/font.h" #include "amiga/gui.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "amiga/print.h" #include "utils/messages.h" #include "utils/utils.h" diff --git a/amiga/stringview/urlhistory.c b/amiga/stringview/urlhistory.c index ec56987f9..fa5aec448 100644 --- a/amiga/stringview/urlhistory.c +++ b/amiga/stringview/urlhistory.c @@ -29,7 +29,7 @@ #include "urlhistory.h" #include "content/urldb.h" -#include "desktop/options.h" +#include "utils/nsoption.h" static struct List PageList; diff --git a/amiga/system_colour.c b/amiga/system_colour.c index c9be5ad4c..d78f54bbc 100644 --- a/amiga/system_colour.c +++ b/amiga/system_colour.c @@ -25,7 +25,7 @@ #include "utils/utils.h" #include "utils/log.h" #include "desktop/gui.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "desktop/tree.h" #include diff --git a/amiga/theme.c b/amiga/theme.c index fa058e043..ca5e2b622 100644 --- a/amiga/theme.c +++ b/amiga/theme.c @@ -37,7 +37,7 @@ #include "amiga/bitmap.h" #include "amiga/drag.h" #include "desktop/browser_private.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "amiga/theme.h" #include "desktop/searchweb.h" #include "utils/messages.h" diff --git a/amiga/thumbnail.c b/amiga/thumbnail.c index f1738d29d..61102feff 100755 --- a/amiga/thumbnail.c +++ b/amiga/thumbnail.c @@ -20,7 +20,7 @@ #include "desktop/browser.h" #include "amiga/gui.h" #include "amiga/bitmap.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "content/urldb.h" #include "desktop/plotters.h" #include "desktop/thumbnail.h" diff --git a/amiga/tree.c b/amiga/tree.c index bbacfdcb2..ddaf81ebc 100644 --- a/amiga/tree.c +++ b/amiga/tree.c @@ -53,7 +53,7 @@ #include "amiga/drag.h" /* drag icon stuff */ #include "amiga/theme.h" /* pointers */ #include "amiga/filetype.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "content/urldb.h" #include "desktop/cookies.h" #include "desktop/history_global_core.h" diff --git a/atari/bitmap.c b/atari/bitmap.c index 0f27be49e..6d986fb5b 100755 --- a/atari/bitmap.c +++ b/atari/bitmap.c @@ -22,7 +22,7 @@ #include "assert.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "image/bitmap.h" #include "atari/bitmap.h" #include "atari/plot/plot.h" diff --git a/atari/ctxmenu.c b/atari/ctxmenu.c index 1806d5499..5b33fe45f 100644 --- a/atari/ctxmenu.c +++ b/atari/ctxmenu.c @@ -42,7 +42,7 @@ #include "atari/rootwin.h" #include "atari/misc.h" #include "atari/clipboard.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "atari/res/netsurf.rsh" #include "atari/ctxmenu.h" diff --git a/atari/deskmenu.c b/atari/deskmenu.c index e2b0dea6b..e4bfa98ba 100644 --- a/atari/deskmenu.c +++ b/atari/deskmenu.c @@ -5,7 +5,7 @@ #include "utils/url.h" #include "desktop/browser.h" #include "desktop/browser_private.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "desktop/save_complete.h" #include "atari/res/netsurf.rsh" #include "atari/gemtk/gemtk.h" diff --git a/atari/download.c b/atari/download.c index 32a6f1252..407be063d 100755 --- a/atari/download.c +++ b/atari/download.c @@ -30,7 +30,7 @@ #include "desktop/gui.h" #include "desktop/history_core.h" #include "desktop/netsurf.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "desktop/save_complete.h" #include "desktop/textinput.h" #include "desktop/download.h" diff --git a/atari/font.c b/atari/font.c index dfa0efee5..7640f6106 100755 --- a/atari/font.c +++ b/atari/font.c @@ -42,7 +42,7 @@ #include "render/font.h" #include "utils/utf8.h" #include "utils/log.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "desktop/mouse.h" #include "desktop/plotters.h" diff --git a/atari/gui.c b/atari/gui.c index 776e30a25..97d63ce3c 100644 --- a/atari/gui.c +++ b/atari/gui.c @@ -40,7 +40,7 @@ #include "desktop/netsurf.h" #include "desktop/401login.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "desktop/save_complete.h" #include "desktop/textinput.h" #include "desktop/browser.h" @@ -922,7 +922,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/atari/history.c b/atari/history.c index aa32cbf7e..49e24ced0 100755 --- a/atari/history.c +++ b/atari/history.c @@ -22,7 +22,7 @@ #include #include #include "desktop/browser.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "desktop/tree.h" #include "desktop/tree_url_node.h" #include "desktop/gui.h" diff --git a/atari/hotlist.c b/atari/hotlist.c index adfd596ca..f3b093d6f 100755 --- a/atari/hotlist.c +++ b/atari/hotlist.c @@ -27,7 +27,7 @@ #include "content/content.h" #include "content/hlcache.h" #include "content/urldb.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "desktop/hotlist.h" #include "desktop/tree.h" #include "desktop/tree_url_node.h" diff --git a/atari/misc.c b/atari/misc.c index e8e6a9bb0..96abcf57a 100755 --- a/atari/misc.c +++ b/atari/misc.c @@ -31,7 +31,7 @@ #include "desktop/mouse.h" #include "desktop/cookies.h" #include "desktop/tree.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "utils/messages.h" #include "utils/utils.h" #include "utils/url.h" diff --git a/atari/plot/font_freetype.c b/atari/plot/font_freetype.c index ed850bce2..8b3980d6d 100755 --- a/atari/plot/font_freetype.c +++ b/atari/plot/font_freetype.c @@ -22,7 +22,7 @@ #include #include FT_CACHE_H -#include "desktop/options.h" +#include "utils/nsoption.h" #include "atari/plot/plot.h" #include "atari/plot/font_freetype.h" #include "atari/findfile.h" diff --git a/atari/plot/plot.c b/atari/plot/plot.c index dfd9b0eff..33810b74e 100755 --- a/atari/plot/plot.c +++ b/atari/plot/plot.c @@ -34,7 +34,7 @@ #include "atari/bitmap.h" #include "atari/gui.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "atari/plot/plot.h" void vq_scrninfo(VdiHdl handle, short *work_out); diff --git a/atari/settings.c b/atari/settings.c index 5244a7f8b..1fc425a39 100644 --- a/atari/settings.c +++ b/atari/settings.c @@ -9,7 +9,7 @@ #include #include -#include "desktop/options.h" +#include "utils/nsoption.h" #include "desktop/plot_style.h" #include "atari/res/netsurf.rsh" #include "atari/settings.h" diff --git a/atari/system_colour.c b/atari/system_colour.c index 5f8673371..efcd7b6ac 100644 --- a/atari/system_colour.c +++ b/atari/system_colour.c @@ -28,7 +28,7 @@ #include "utils/utils.h" #include "utils/log.h" #include "desktop/gui.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "desktop/plot_style.h" struct gui_system_colour_ctx { diff --git a/atari/toolbar.c b/atari/toolbar.c index 18d8a456a..79be31b73 100644 --- a/atari/toolbar.c +++ b/atari/toolbar.c @@ -37,7 +37,7 @@ #include "desktop/plot_style.h" #include "desktop/plotters.h" #include "desktop/tree.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "utils/utf8.h" #include "atari/clipboard.h" #include "atari/gui.h" diff --git a/beos/fetch_rsrc.cpp b/beos/fetch_rsrc.cpp index 6f78aafa5..c52cafe8c 100644 --- a/beos/fetch_rsrc.cpp +++ b/beos/fetch_rsrc.cpp @@ -35,7 +35,7 @@ extern "C" { #include "content/fetch.h" #include "content/urldb.h" #include "desktop/netsurf.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "utils/log.h" #include "utils/messages.h" #include "utils/url.h" diff --git a/beos/font.cpp b/beos/font.cpp index b73c9cc1a..5636743f5 100644 --- a/beos/font.cpp +++ b/beos/font.cpp @@ -35,7 +35,7 @@ extern "C" { #include "render/font.h" #include "utils/utils.h" #include "utils/log.h" -#include "desktop/options.h" +#include "utils/nsoption.h" } #include "beos/gui.h" diff --git a/beos/gui.cpp b/beos/gui.cpp index 091346605..4d4549cc0 100644 --- a/beos/gui.cpp +++ b/beos/gui.cpp @@ -53,7 +53,7 @@ extern "C" { #include "desktop/cookies.h" #include "desktop/gui.h" #include "desktop/netsurf.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "render/form.h" #include "utils/filename.h" @@ -467,7 +467,7 @@ int gui_init_replicant(int argc, char** argv) return 0; } -/* 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/beos/gui_options.cpp b/beos/gui_options.cpp index 62e6640c3..2c56cf710 100644 --- a/beos/gui_options.cpp +++ b/beos/gui_options.cpp @@ -23,7 +23,7 @@ #include extern "C" { #include "utils/log.h" -#include "desktop/options.h" +#include "utils/nsoption.h" } #include "beos/gui.h" #include "beos/scaffolding.h" diff --git a/beos/plotters.cpp b/beos/plotters.cpp index aabf30200..c2a99fea0 100644 --- a/beos/plotters.cpp +++ b/beos/plotters.cpp @@ -35,7 +35,7 @@ extern "C" { #include "render/font.h" #include "utils/log.h" #include "utils/utils.h" -#include "desktop/options.h" +#include "utils/nsoption.h" } #include "beos/font.h" #include "beos/gui.h" diff --git a/beos/scaffolding.cpp b/beos/scaffolding.cpp index 9954dd678..fe40b0c70 100644 --- a/beos/scaffolding.cpp +++ b/beos/scaffolding.cpp @@ -56,7 +56,7 @@ extern "C" { #include "desktop/gui.h" #include "desktop/netsurf.h" #include "desktop/plotters.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "desktop/textinput.h" #include "render/font.h" #include "render/form.h" diff --git a/beos/system_colour.cpp b/beos/system_colour.cpp index 9f3f4084b..7a94d4cfc 100644 --- a/beos/system_colour.cpp +++ b/beos/system_colour.cpp @@ -34,7 +34,7 @@ extern "C" { #include "utils/utils.h" #include "utils/log.h" #include "desktop/gui.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "desktop/plot_style.h" } diff --git a/beos/window.cpp b/beos/window.cpp index 3ce8e274c..64ef616bb 100644 --- a/beos/window.cpp +++ b/beos/window.cpp @@ -25,7 +25,7 @@ extern "C" { #include "css/utils.h" #include "desktop/browser_private.h" #include "desktop/mouse.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "desktop/textinput.h" #include "render/font.h" #include "utils/log.h" diff --git a/cocoa/BrowserView.m b/cocoa/BrowserView.m index 4bda3b563..c472fd7d7 100644 --- a/cocoa/BrowserView.m +++ b/cocoa/BrowserView.m @@ -27,7 +27,7 @@ #import "desktop/history_core.h" #import "desktop/plotters.h" #import "desktop/textinput.h" -#import "desktop/options.h" +#import "utils/nsoption.h" #import "utils/messages.h" @interface BrowserView () diff --git a/cocoa/BrowserViewController.m b/cocoa/BrowserViewController.m index bea383d5c..4952f52e3 100644 --- a/cocoa/BrowserViewController.m +++ b/cocoa/BrowserViewController.m @@ -23,7 +23,7 @@ #import "desktop/browser_private.h" #import "desktop/history_core.h" #import "desktop/textinput.h" -#import "desktop/options.h" +#import "utils/nsoption.h" #import "utils/corestrings.h" #import "utils/filename.h" diff --git a/cocoa/BrowserWindowController.m b/cocoa/BrowserWindowController.m index 7688c1a58..2edb9a1db 100644 --- a/cocoa/BrowserWindowController.m +++ b/cocoa/BrowserWindowController.m @@ -26,7 +26,7 @@ #import "cocoa/NetsurfApp.h" #import "desktop/browser.h" -#import "desktop/options.h" +#import "utils/nsoption.h" #import "utils/messages.h" @interface BrowserWindowController () diff --git a/cocoa/NetSurfAppDelegate.m b/cocoa/NetSurfAppDelegate.m index 0a352c633..4a66212e8 100644 --- a/cocoa/NetSurfAppDelegate.m +++ b/cocoa/NetSurfAppDelegate.m @@ -22,7 +22,7 @@ #import "cocoa/HistoryWindowController.h" #import "desktop/browser.h" -#import "desktop/options.h" +#import "utils/nsoption.h" #import "utils/messages.h" @interface NetSurfAppDelegate () diff --git a/cocoa/NetsurfApp.m b/cocoa/NetsurfApp.m index 1c288e861..0bcbefd24 100644 --- a/cocoa/NetsurfApp.m +++ b/cocoa/NetsurfApp.m @@ -29,7 +29,7 @@ #import "desktop/history_core.h" #import "desktop/mouse.h" #import "desktop/netsurf.h" -#import "desktop/options.h" +#import "utils/nsoption.h" #import "desktop/plotters.h" #import "desktop/save_complete.h" #import "desktop/textinput.h" @@ -163,7 +163,7 @@ void cocoa_autorelease( void ) pool = [[NSAutoreleasePool alloc] init]; } -/* 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/cocoa/PreferencesWindowController.m b/cocoa/PreferencesWindowController.m index 8ee4580f5..a3abe2908 100644 --- a/cocoa/PreferencesWindowController.m +++ b/cocoa/PreferencesWindowController.m @@ -24,7 +24,7 @@ #import "desktop/browser_private.h" #import "content/content.h" -#import "desktop/options.h" +#import "utils/nsoption.h" @implementation PreferencesWindowController diff --git a/cocoa/font.m b/cocoa/font.m index 915e7c826..08fad0a36 100644 --- a/cocoa/font.m +++ b/cocoa/font.m @@ -22,7 +22,7 @@ #import "cocoa/font.h" #import "css/css.h" -#import "desktop/options.h" +#import "utils/nsoption.h" #import "render/font.h" #import "desktop/plotters.h" diff --git a/cocoa/gui.m b/cocoa/gui.m index fe92c5225..b2ff01dc0 100644 --- a/cocoa/gui.m +++ b/cocoa/gui.m @@ -28,7 +28,7 @@ #import "desktop/gui.h" #import "desktop/netsurf.h" #import "desktop/browser_private.h" -#import "desktop/options.h" +#import "utils/nsoption.h" #import "desktop/textinput.h" #import "desktop/401login.h" #import "utils/utils.h" diff --git a/cocoa/system_colour.m b/cocoa/system_colour.m index bd3e87f46..48330d063 100644 --- a/cocoa/system_colour.m +++ b/cocoa/system_colour.m @@ -24,7 +24,7 @@ #import "utils/utils.h" #import "utils/log.h" #import "desktop/gui.h" -#import "desktop/options.h" +#import "utils/nsoption.h" struct gui_system_colour_ctx { const char *name; diff --git a/content/content.c b/content/content.c index 1825bdf10..186c5bee8 100644 --- a/content/content.c +++ b/content/content.c @@ -37,7 +37,7 @@ #include "css/css.h" #include "image/bitmap.h" #include "desktop/browser.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "render/html.h" #include "render/textplain.h" diff --git a/content/fetch.c b/content/fetch.c index bfe4458cf..6f829bb71 100644 --- a/content/fetch.c +++ b/content/fetch.c @@ -45,7 +45,7 @@ #include "content/fetchers/file.h" #include "content/urldb.h" #include "desktop/netsurf.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "utils/log.h" #include "utils/messages.h" #include "utils/nsurl.h" diff --git a/content/fetchers/about.c b/content/fetchers/about.c index 387e32a98..85723e86a 100644 --- a/content/fetchers/about.c +++ b/content/fetchers/about.c @@ -47,7 +47,7 @@ #include "content/fetchers/about.h" #include "content/urldb.h" #include "desktop/netsurf.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "utils/log.h" #include "utils/messages.h" #include "utils/url.h" diff --git a/content/fetchers/curl.c b/content/fetchers/curl.c index 668e05a46..ed4c75952 100644 --- a/content/fetchers/curl.c +++ b/content/fetchers/curl.c @@ -45,7 +45,7 @@ #include "content/fetchers/curl.h" #include "content/urldb.h" #include "desktop/netsurf.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "utils/log.h" #include "utils/messages.h" #include "utils/schedule.h" diff --git a/content/fetchers/data.c b/content/fetchers/data.c index 77d3c9f9c..fbaa24780 100644 --- a/content/fetchers/data.c +++ b/content/fetchers/data.c @@ -34,7 +34,7 @@ #include "content/fetchers/data.h" #include "content/urldb.h" #include "desktop/netsurf.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "utils/log.h" #include "utils/messages.h" #include "utils/url.h" diff --git a/content/fetchers/file.c b/content/fetchers/file.c index b7b831d7b..21cee79d5 100644 --- a/content/fetchers/file.c +++ b/content/fetchers/file.c @@ -47,7 +47,7 @@ #include "content/fetchers/file.h" #include "content/urldb.h" #include "desktop/netsurf.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "utils/errors.h" #include "utils/log.h" #include "utils/messages.h" diff --git a/content/fetchers/resource.c b/content/fetchers/resource.c index 1fc33f882..4afd44310 100644 --- a/content/fetchers/resource.c +++ b/content/fetchers/resource.c @@ -42,7 +42,7 @@ #include "content/fetchers/resource.h" #include "content/urldb.h" #include "desktop/gui.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "utils/log.h" #include "utils/messages.h" #include "utils/url.h" diff --git a/content/urldb.c b/content/urldb.c index 059c3c687..c950dcd90 100644 --- a/content/urldb.c +++ b/content/urldb.c @@ -101,7 +101,7 @@ #include "content/content.h" #include "content/urldb.h" #include "desktop/cookies.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "utils/log.h" #include "utils/corestrings.h" #include "utils/filename.h" diff --git a/css/select.c b/css/select.c index b9b8c28c3..0f1962b5d 100644 --- a/css/select.c +++ b/css/select.c @@ -27,7 +27,7 @@ #include "css/select.h" #include "css/utils.h" #include "desktop/gui.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "utils/corestrings.h" #include "utils/log.h" #include "utils/url.h" diff --git a/css/utils.c b/css/utils.c index d5acf4932..9bf743cac 100644 --- a/css/utils.c +++ b/css/utils.c @@ -21,7 +21,7 @@ #include "css/utils.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "utils/log.h" /** Screen DPI in fixed point units: defaults to 90, which RISC OS uses */ diff --git a/desktop/browser.c b/desktop/browser.c index 2693a1871..b7ec98947 100644 --- a/desktop/browser.c +++ b/desktop/browser.c @@ -49,7 +49,7 @@ #include "desktop/hotlist.h" #include "desktop/gui.h" #include "desktop/knockout.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "desktop/scrollbar.h" #include "desktop/selection.h" #include "desktop/plotters.h" diff --git a/desktop/cookies.c b/desktop/cookies.c index 197b3fbd1..9f66aea1e 100644 --- a/desktop/cookies.c +++ b/desktop/cookies.c @@ -31,7 +31,7 @@ #include "content/hlcache.h" #include "content/urldb.h" #include "desktop/cookies.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "desktop/tree.h" #include "utils/log.h" #include "utils/messages.h" diff --git a/desktop/netsurf.c b/desktop/netsurf.c index b6e342c58..f63969b76 100644 --- a/desktop/netsurf.c +++ b/desktop/netsurf.c @@ -40,7 +40,7 @@ #include "desktop/401login.h" #include "desktop/browser.h" #include "desktop/gui.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "desktop/searchweb.h" #include "javascript/js.h" diff --git a/desktop/options.c b/desktop/options.c index 2a080d564..00c37f128 100644 --- a/desktop/options.c +++ b/desktop/options.c @@ -36,7 +36,7 @@ #include "desktop/plot_style.h" #include "utils/log.h" #include "utils/utils.h" -#include "desktop/options.h" +#include "utils/nsoptions.h" struct ns_options nsoptions = { NSOPTION_MAIN_DEFAULTS, diff --git a/desktop/print.c b/desktop/print.c index e1cd48f93..8f83f2d19 100644 --- a/desktop/print.c +++ b/desktop/print.c @@ -30,7 +30,7 @@ #include "content/content.h" #include "content/hlcache.h" #include "css/utils.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "desktop/print.h" #include "desktop/printer.h" #include "render/box.h" diff --git a/desktop/save_pdf/font_haru.c b/desktop/save_pdf/font_haru.c index c90753121..57d36fe95 100644 --- a/desktop/save_pdf/font_haru.c +++ b/desktop/save_pdf/font_haru.c @@ -39,7 +39,7 @@ #include "css/css.h" #include "css/utils.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "desktop/save_pdf/font_haru.h" #include "render/font.h" #include "utils/log.h" diff --git a/desktop/save_pdf/pdf_plotters.c b/desktop/save_pdf/pdf_plotters.c index 847d6dafc..123408dd3 100644 --- a/desktop/save_pdf/pdf_plotters.c +++ b/desktop/save_pdf/pdf_plotters.c @@ -31,7 +31,7 @@ #include #include "content/hlcache.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "desktop/plotters.h" #include "desktop/print.h" #include "desktop/printer.h" diff --git a/desktop/scrollbar.c b/desktop/scrollbar.c index 5517a6f0d..d24ea727a 100644 --- a/desktop/scrollbar.c +++ b/desktop/scrollbar.c @@ -27,7 +27,7 @@ #include "desktop/mouse.h" #include "desktop/scrollbar.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "desktop/plotters.h" #include "desktop/plot_style.h" #include "utils/log.h" diff --git a/desktop/search.c b/desktop/search.c index 014488e2d..3a7c768a5 100644 --- a/desktop/search.c +++ b/desktop/search.c @@ -30,7 +30,7 @@ #include "content/hlcache.h" #include "desktop/browser_private.h" #include "desktop/gui.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "desktop/search.h" #include "desktop/selection.h" #include "render/box.h" diff --git a/desktop/searchweb.c b/desktop/searchweb.c index a90627ac6..87e3e21f1 100644 --- a/desktop/searchweb.c +++ b/desktop/searchweb.c @@ -27,7 +27,7 @@ #include "content/hlcache.h" #include "desktop/browser.h" #include "desktop/gui.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "desktop/searchweb.h" #include "utils/config.h" #include "utils/log.h" diff --git a/desktop/thumbnail.c b/desktop/thumbnail.c index 975e799fa..1011adc1f 100644 --- a/desktop/thumbnail.c +++ b/desktop/thumbnail.c @@ -27,7 +27,7 @@ #include "content/hlcache.h" #include "desktop/browser.h" #include "desktop/knockout.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "desktop/plotters.h" #include "desktop/thumbnail.h" #include "utils/log.h" diff --git a/desktop/tree.c b/desktop/tree.c index c62793e02..25bd9488b 100644 --- a/desktop/tree.c +++ b/desktop/tree.c @@ -34,7 +34,7 @@ #include "desktop/textarea.h" #include "desktop/textinput.h" #include "desktop/tree.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "desktop/plotters.h" #include "render/font.h" #include "utils/log.h" diff --git a/desktop/tree_url_node.c b/desktop/tree_url_node.c index 938cd1d69..945893f18 100644 --- a/desktop/tree_url_node.c +++ b/desktop/tree_url_node.c @@ -32,7 +32,7 @@ #include "content/hlcache.h" #include "content/urldb.h" #include "desktop/browser.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "desktop/tree_url_node.h" #include "utils/corestrings.h" #include "utils/libdom.h" diff --git a/framebuffer/font_freetype.c b/framebuffer/font_freetype.c index 987b101c7..87751a39d 100644 --- a/framebuffer/font_freetype.c +++ b/framebuffer/font_freetype.c @@ -29,7 +29,7 @@ #include "utils/filepath.h" #include "utils/utf8.h" #include "utils/log.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "framebuffer/gui.h" #include "framebuffer/font.h" diff --git a/framebuffer/font_internal.c b/framebuffer/font_internal.c index ff2bfa1ef..60f1b8e5a 100644 --- a/framebuffer/font_internal.c +++ b/framebuffer/font_internal.c @@ -23,7 +23,7 @@ #include #include "css/css.h" #include "render/font.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "utils/utf8.h" #include "framebuffer/gui.h" diff --git a/framebuffer/gui.c b/framebuffer/gui.c index 4277557b4..7e2ff2bc1 100644 --- a/framebuffer/gui.c +++ b/framebuffer/gui.c @@ -36,7 +36,7 @@ #include "desktop/mouse.h" #include "desktop/plotters.h" #include "desktop/netsurf.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "utils/filepath.h" #include "utils/log.h" #include "utils/messages.h" @@ -476,7 +476,7 @@ process_cmdline(int argc, char** argv) return true; } -/* 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/framebuffer/localhistory.c b/framebuffer/localhistory.c index f6c24a1a4..e23dd1f99 100644 --- a/framebuffer/localhistory.c +++ b/framebuffer/localhistory.c @@ -35,7 +35,7 @@ #include "desktop/gui.h" #include "desktop/plotters.h" #include "desktop/netsurf.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "utils/log.h" #include "utils/url.h" #include "utils/messages.h" diff --git a/framebuffer/system_colour.c b/framebuffer/system_colour.c index 18b25eee3..139cd4780 100644 --- a/framebuffer/system_colour.c +++ b/framebuffer/system_colour.c @@ -24,7 +24,7 @@ #include "utils/utils.h" #include "utils/log.h" #include "desktop/gui.h" -#include "desktop/options.h" +#include "utils/nsoption.h" struct gui_system_colour_ctx { const char *name; diff --git a/gtk/completion.c b/gtk/completion.c index d249db160..a0df08ad9 100644 --- a/gtk/completion.c +++ b/gtk/completion.c @@ -21,7 +21,7 @@ #include "content/urldb.h" #include "utils/log.h" -#include "desktop/options.h" +#include "utils/nsoption.h" GtkListStore *nsgtk_completion_list; diff --git a/gtk/dialogs/preferences.c b/gtk/dialogs/preferences.c index 2784eb7a1..430554caf 100644 --- a/gtk/dialogs/preferences.c +++ b/gtk/dialogs/preferences.c @@ -20,7 +20,7 @@ #include #include "desktop/browser_private.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "desktop/searchweb.h" #include "utils/log.h" #include "utils/utils.h" diff --git a/gtk/dialogs/source.c b/gtk/dialogs/source.c index c50679066..ef4e36eb3 100644 --- a/gtk/dialogs/source.c +++ b/gtk/dialogs/source.c @@ -33,7 +33,7 @@ #include "desktop/browser_private.h" #include "desktop/netsurf.h" #include "desktop/print.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "utils/messages.h" #include "utils/url.h" #include "utils/utils.h" diff --git a/gtk/download.c b/gtk/download.c index 71b1aa633..e882ec798 100644 --- a/gtk/download.c +++ b/gtk/download.c @@ -30,7 +30,7 @@ #include "desktop/gui.h" #include "gtk/gui.h" #include "gtk/scaffolding.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "gtk/download.h" #include "gtk/window.h" #include "gtk/compat.h" diff --git a/gtk/font_pango.c b/gtk/font_pango.c index de115fa64..aa4fae319 100644 --- a/gtk/font_pango.c +++ b/gtk/font_pango.c @@ -34,7 +34,7 @@ #include "render/font.h" #include "utils/utils.h" #include "utils/log.h" -#include "desktop/options.h" +#include "utils/nsoption.h" static bool nsfont_width(const plot_font_style_t *fstyle, const char *string, size_t length, diff --git a/gtk/gui.c b/gtk/gui.c index 832d79e6e..3408bb9ac 100644 --- a/gtk/gui.c +++ b/gtk/gui.c @@ -49,7 +49,7 @@ #include "desktop/gui.h" #include "desktop/history_global_core.h" #include "desktop/netsurf.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "desktop/save_complete.h" #include "desktop/save_pdf/pdf_plotters.h" #include "desktop/searchweb.h" @@ -241,7 +241,7 @@ nsgtk_init_glade(char **respath) widWarning = GTK_WIDGET(gtk_builder_get_object(gladeWarning, "labelWarning")); } -/* Documented in desktop/options.h */ +/* Documented in utils/nsoption.h */ void gui_options_init_defaults(void) { char *hdir = getenv("HOME"); diff --git a/gtk/hotlist.c b/gtk/hotlist.c index d7b5b9e8f..d249d3444 100644 --- a/gtk/hotlist.c +++ b/gtk/hotlist.c @@ -18,7 +18,7 @@ #include "desktop/hotlist.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "desktop/plotters.h" #include "desktop/tree.h" #include "gtk/gui.h" diff --git a/gtk/plotters.c b/gtk/plotters.c index 3af55b9d5..265061188 100644 --- a/gtk/plotters.c +++ b/gtk/plotters.c @@ -37,7 +37,7 @@ #include "gtk/plotters.h" #include "gtk/scaffolding.h" #include "render/font.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "gtk/bitmap.h" GtkWidget *current_widget; diff --git a/gtk/print.c b/gtk/print.c index 02d89bbdb..68a96dc2d 100644 --- a/gtk/print.c +++ b/gtk/print.c @@ -33,7 +33,7 @@ #include "content/content.h" #include "content/hlcache.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "desktop/plotters.h" #include "desktop/print.h" #include "desktop/printer.h" diff --git a/gtk/scaffolding.c b/gtk/scaffolding.c index 5abda6276..01f7fe5c2 100644 --- a/gtk/scaffolding.c +++ b/gtk/scaffolding.c @@ -37,7 +37,7 @@ #include "desktop/hotlist.h" #include "desktop/gui.h" #include "desktop/netsurf.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "desktop/plotters.h" #include "desktop/print.h" #include "desktop/save_complete.h" diff --git a/gtk/system_colour.c b/gtk/system_colour.c index 6c1fd81b5..c136e50a0 100644 --- a/gtk/system_colour.c +++ b/gtk/system_colour.c @@ -24,7 +24,7 @@ #include "utils/utils.h" #include "utils/log.h" #include "desktop/gui.h" -#include "desktop/options.h" +#include "utils/nsoption.h" struct gui_system_colour_ctx { const char *name; diff --git a/gtk/tabs.c b/gtk/tabs.c index e68a192ad..462f6668e 100644 --- a/gtk/tabs.c +++ b/gtk/tabs.c @@ -24,7 +24,7 @@ #include "gtk/gui.h" #include "desktop/browser.h" #include "content/content.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "desktop/search.h" #include "utils/utils.h" #include "gtk/search.h" diff --git a/gtk/theme.c b/gtk/theme.c index 402433c32..9d50c5931 100644 --- a/gtk/theme.c +++ b/gtk/theme.c @@ -31,7 +31,7 @@ #include "gtk/menu.h" #include "gtk/theme.h" #include "gtk/window.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "gtk/dialogs/preferences.h" #include "utils/container.h" #include "utils/log.h" diff --git a/gtk/window.c b/gtk/window.c index 557ea22eb..44b88d241 100644 --- a/gtk/window.c +++ b/gtk/window.c @@ -30,7 +30,7 @@ #include "gtk/window.h" #include "desktop/browser_private.h" #include "desktop/mouse.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "desktop/searchweb.h" #include "desktop/textinput.h" #include "gtk/compat.h" diff --git a/image/gif.c b/image/gif.c index 704c9710b..4bd45c7fe 100644 --- a/image/gif.c +++ b/image/gif.c @@ -37,7 +37,7 @@ #include "utils/config.h" #include "content/content_protected.h" #include "content/hlcache.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "desktop/plotters.h" #include "image/image.h" #include "image/bitmap.h" diff --git a/image/mng.c b/image/mng.c index 518dc8552..325d1d192 100644 --- a/image/mng.c +++ b/image/mng.c @@ -28,7 +28,7 @@ #include #include #include "content/content_protected.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "desktop/plotters.h" #include "image/bitmap.h" #include "image/mng.h" diff --git a/javascript/jsapi/navigator.bnd b/javascript/jsapi/navigator.bnd index 2fb0c2d0a..5a0bb395b 100644 --- a/javascript/jsapi/navigator.bnd +++ b/javascript/jsapi/navigator.bnd @@ -22,8 +22,8 @@ preamble %{ #include #include "desktop/netsurf.h" -#include "desktop/options.h" #include "utils/config.h" +#include "utils/nsoption.h" #include "utils/useragent.h" #include "utils/log.h" #include "utils/utsname.h" diff --git a/javascript/none.c b/javascript/none.c index 600a50860..d4b8ce565 100644 --- a/javascript/none.c +++ b/javascript/none.c @@ -21,7 +21,7 @@ */ #include "content/content.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "javascript/js.h" #include "utils/log.h" diff --git a/monkey/font.c b/monkey/font.c index 7f390a49b..a45b7fdca 100644 --- a/monkey/font.c +++ b/monkey/font.c @@ -18,7 +18,7 @@ #include "css/css.h" #include "render/font.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "utils/utf8.h" diff --git a/monkey/main.c b/monkey/main.c index 6dd1a5ac0..2e373171e 100644 --- a/monkey/main.c +++ b/monkey/main.c @@ -21,7 +21,7 @@ #include #include "monkey/filetype.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "monkey/poll.h" #include "monkey/dispatch.h" #include "monkey/browser.h" @@ -92,7 +92,7 @@ static void quit_handler(int argc, char **argv) netsurf_quit = true; } -/* 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/monkey/system_colour.c b/monkey/system_colour.c index 6c1fd81b5..c136e50a0 100644 --- a/monkey/system_colour.c +++ b/monkey/system_colour.c @@ -24,7 +24,7 @@ #include "utils/utils.h" #include "utils/log.h" #include "desktop/gui.h" -#include "desktop/options.h" +#include "utils/nsoption.h" struct gui_system_colour_ctx { const char *name; diff --git a/render/box.c b/render/box.c index 5dfada0c0..1f2c9fe0e 100644 --- a/render/box.c +++ b/render/box.c @@ -34,7 +34,7 @@ #include "css/utils.h" #include "css/dump.h" #include "desktop/scrollbar.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "render/box.h" #include "render/form.h" #include "render/html_internal.h" diff --git a/render/box_construct.c b/render/box_construct.c index 78d0f6742..03e87e81d 100644 --- a/render/box_construct.c +++ b/render/box_construct.c @@ -36,7 +36,7 @@ #include "css/css.h" #include "css/utils.h" #include "css/select.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "render/box.h" #include "render/box_textarea.h" #include "render/form.h" diff --git a/render/font.c b/render/font.c index a98a89ada..03c5a36fb 100644 --- a/render/font.c +++ b/render/font.c @@ -18,7 +18,7 @@ #include "css/css.h" #include "css/utils.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "render/font.h" static plot_font_generic_family_t plot_font_generic_family( diff --git a/render/html.c b/render/html.c index c3430a4a5..0f63967a9 100644 --- a/render/html.c +++ b/render/html.c @@ -32,7 +32,7 @@ #include "content/content_protected.h" #include "content/fetch.h" #include "content/hlcache.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "desktop/selection.h" #include "desktop/scrollbar.h" #include "desktop/textarea.h" diff --git a/render/html_css.c b/render/html_css.c index a5c63554f..fad642461 100644 --- a/render/html_css.c +++ b/render/html_css.c @@ -28,7 +28,7 @@ #include #include "content/hlcache.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "render/html_internal.h" #include "utils/corestrings.h" #include "utils/config.h" diff --git a/render/html_interaction.c b/render/html_interaction.c index 7c3de2a01..6f4d9bd51 100644 --- a/render/html_interaction.c +++ b/render/html_interaction.c @@ -32,7 +32,7 @@ #include "desktop/browser.h" #include "desktop/frames.h" #include "desktop/mouse.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "desktop/scrollbar.h" #include "desktop/selection.h" #include "desktop/textarea.h" diff --git a/render/html_object.c b/render/html_object.c index b8f95dbab..aad0daca6 100644 --- a/render/html_object.c +++ b/render/html_object.c @@ -28,7 +28,7 @@ #include #include "content/hlcache.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "desktop/scrollbar.h" #include "render/box.h" #include "render/html_internal.h" diff --git a/render/html_redraw.c b/render/html_redraw.c index bf6cec692..13cffe6ed 100644 --- a/render/html_redraw.c +++ b/render/html_redraw.c @@ -38,7 +38,7 @@ #include "css/utils.h" #include "desktop/plotters.h" #include "desktop/selection.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "desktop/print.h" #include "desktop/scrollbar.h" #include "desktop/textarea.h" diff --git a/render/layout.c b/render/layout.c index 18f67b7d3..14d06ee5a 100644 --- a/render/layout.c +++ b/render/layout.c @@ -44,7 +44,7 @@ #include "css/css.h" #include "css/utils.h" #include "content/content_protected.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "desktop/scrollbar.h" #include "desktop/textarea.h" #include "render/box.h" diff --git a/render/textplain.c b/render/textplain.c index 89628f914..10cf16a71 100644 --- a/render/textplain.c +++ b/render/textplain.c @@ -36,7 +36,7 @@ #include "css/utils.h" #include "desktop/browser.h" #include "desktop/gui.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "desktop/plotters.h" #include "desktop/search.h" #include "desktop/selection.h" 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 #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 -#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 #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 -#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 #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 -#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 -#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 -#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" diff --git a/test/urldbtest.c b/test/urldbtest.c index ab441ffa5..bc9d899a1 100644 --- a/test/urldbtest.c +++ b/test/urldbtest.c @@ -33,7 +33,7 @@ #include "content/content.h" #include "content/urldb.h" #include "desktop/cookies.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #ifdef riscos /** \todo lose this */ #include "riscos/bitmap.h" diff --git a/windows/font.c b/windows/font.c index 564a7dec0..c99cec7cf 100644 --- a/windows/font.c +++ b/windows/font.c @@ -28,7 +28,7 @@ #include "css/css.h" #include "render/font.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "utils/utf8.h" #include "windows/font.h" diff --git a/windows/gui.c b/windows/gui.c index e318f3a4e..159e8f0c1 100644 --- a/windows/gui.c +++ b/windows/gui.c @@ -36,7 +36,7 @@ #include "desktop/history_core.h" #include "desktop/mouse.h" #include "desktop/netsurf.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "desktop/plotters.h" #include "desktop/textinput.h" #include "render/html.h" diff --git a/windows/main.c b/windows/main.c index 3ead210c7..384386822 100644 --- a/windows/main.c +++ b/windows/main.c @@ -24,7 +24,7 @@ #include #include "desktop/gui.h" -#include "desktop/options.h" +#include "utils/nsoption.h" #include "desktop/browser.h" #include "utils/utils.h" #include "utils/log.h" @@ -80,7 +80,7 @@ static bool nslog_ensure(FILE *fptr) return true; } -/* 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/windows/prefs.c b/windows/prefs.c index 577c2a509..360a54011 100644 --- a/windows/prefs.c +++ b/windows/prefs.c @@ -21,7 +21,7 @@ #include #include -#include "desktop/options.h" +#include "utils/nsoption.h" #include "utils/log.h" #include "utils/messages.h" #include "utils/utils.h" diff --git a/windows/system_colour.c b/windows/system_colour.c index 6c1fd81b5..c136e50a0 100644 --- a/windows/system_colour.c +++ b/windows/system_colour.c @@ -24,7 +24,7 @@ #include "utils/utils.h" #include "utils/log.h" #include "desktop/gui.h" -#include "desktop/options.h" +#include "utils/nsoption.h" struct gui_system_colour_ctx { const char *name; -- cgit v1.2.3