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 +- 20 files changed, 21 insertions(+), 21 deletions(-) (limited to 'amiga') 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" -- cgit v1.2.3