From 7fc0a4c481d7adad14a42740037d50b2f9e1cdc1 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Mon, 30 May 2016 17:32:57 +0100 Subject: move desktop window header into public API --- frontends/riscos/401login.c | 1 - frontends/riscos/dialog.c | 2 +- frontends/riscos/gui.c | 2 +- frontends/riscos/gui/url_bar.c | 2 +- frontends/riscos/iconbar.c | 7 ++++--- frontends/riscos/menus.c | 1 - frontends/riscos/print.c | 2 +- frontends/riscos/save.c | 2 +- frontends/riscos/search.c | 3 +-- frontends/riscos/sslcert.c | 1 - frontends/riscos/textarea.c | 1 - frontends/riscos/textselection.c | 9 +++++---- frontends/riscos/theme_install.c | 1 - frontends/riscos/treeview.c | 1 - frontends/riscos/uri.c | 7 ++++++- frontends/riscos/url_complete.c | 7 ++++--- frontends/riscos/url_protocol.c | 7 ++++--- frontends/riscos/window.c | 2 +- 18 files changed, 30 insertions(+), 28 deletions(-) (limited to 'frontends/riscos') diff --git a/frontends/riscos/401login.c b/frontends/riscos/401login.c index e95a74809..476d631a2 100644 --- a/frontends/riscos/401login.c +++ b/frontends/riscos/401login.c @@ -28,7 +28,6 @@ #include "content/content.h" #include "content/hlcache.h" #include "content/urldb.h" -#include "desktop/browser.h" #include "riscos/gui.h" #include "riscos/dialog.h" diff --git a/frontends/riscos/dialog.c b/frontends/riscos/dialog.c index d4356086d..2b258bbca 100644 --- a/frontends/riscos/dialog.c +++ b/frontends/riscos/dialog.c @@ -39,7 +39,7 @@ #include "utils/messages.h" #include "utils/nsurl.h" #include "desktop/version.h" -#include "desktop/browser.h" +#include "netsurf/browser_window.h" #include "riscos/configure.h" #include "riscos/cookies.h" diff --git a/frontends/riscos/gui.c b/frontends/riscos/gui.c index 531b81694..e0e8e4e3b 100644 --- a/frontends/riscos/gui.c +++ b/frontends/riscos/gui.c @@ -52,7 +52,7 @@ #include "desktop/save_complete.h" #include "desktop/treeview.h" #include "netsurf/netsurf.h" -#include "desktop/browser.h" +#include "netsurf/browser_window.h" #include "content/urldb.h" #include "content/hlcache.h" #include "content/backing_store.h" diff --git a/frontends/riscos/gui/url_bar.c b/frontends/riscos/gui/url_bar.c index 053014784..37c4de111 100644 --- a/frontends/riscos/gui/url_bar.c +++ b/frontends/riscos/gui/url_bar.c @@ -37,7 +37,7 @@ #include "utils/utils.h" #include "content/hlcache.h" #include "content/content.h" -#include "desktop/browser.h" +#include "netsurf/browser_window.h" #include "desktop/plotters.h" #include "riscos/gui.h" diff --git a/frontends/riscos/iconbar.c b/frontends/riscos/iconbar.c index 9cff116a1..8582a4539 100644 --- a/frontends/riscos/iconbar.c +++ b/frontends/riscos/iconbar.c @@ -16,8 +16,9 @@ * along with this program. If not, see . */ -/** \file - * Iconbar icon and menus (implementation). +/** + * \file + * Iconbar icon and menus implementation. */ #include @@ -36,7 +37,7 @@ #include "utils/log.h" #include "utils/messages.h" #include "utils/nsurl.h" -#include "desktop/browser.h" +#include "netsurf/browser_window.h" #include "riscos/gui.h" #include "riscos/configure.h" diff --git a/frontends/riscos/menus.c b/frontends/riscos/menus.c index 37285c9d1..0b1ac1a2b 100644 --- a/frontends/riscos/menus.c +++ b/frontends/riscos/menus.c @@ -40,7 +40,6 @@ #include "content/hlcache.h" #include "content/urldb.h" #include "desktop/cookie_manager.h" -#include "desktop/browser.h" #include "desktop/textinput.h" #include "riscos/dialog.h" diff --git a/frontends/riscos/print.c b/frontends/riscos/print.c index 95730d6be..26b50f65f 100644 --- a/frontends/riscos/print.c +++ b/frontends/riscos/print.c @@ -38,7 +38,7 @@ #include "utils/nsoption.h" #include "content/content.h" #include "content/hlcache.h" -#include "desktop/browser.h" +#include "netsurf/browser_window.h" #include "desktop/plotters.h" #include "riscos/gui.h" diff --git a/frontends/riscos/save.c b/frontends/riscos/save.c index 6eab31533..325dbbb79 100644 --- a/frontends/riscos/save.c +++ b/frontends/riscos/save.c @@ -42,7 +42,7 @@ #include "utils/utf8.h" #include "content/content.h" #include "content/hlcache.h" -#include "desktop/browser.h" +#include "netsurf/browser_window.h" #include "desktop/hotlist.h" #include "desktop/global_history.h" #include "desktop/version.h" diff --git a/frontends/riscos/search.c b/frontends/riscos/search.c index 2e869bb43..544630e2e 100644 --- a/frontends/riscos/search.c +++ b/frontends/riscos/search.c @@ -33,9 +33,8 @@ #include "utils/messages.h" #include "content/content.h" #include "content/hlcache.h" -#include "desktop/browser.h" +#include "netsurf/browser_window.h" #include "netsurf/search.h" -#include "desktop/browser.h" #include "desktop/search.h" #include "riscos/gui.h" diff --git a/frontends/riscos/sslcert.c b/frontends/riscos/sslcert.c index 9e43f2db1..7ab909dfa 100644 --- a/frontends/riscos/sslcert.c +++ b/frontends/riscos/sslcert.c @@ -34,7 +34,6 @@ #include "content/hlcache.h" #include "content/fetch.h" #include "content/urldb.h" -#include "desktop/browser.h" #include "desktop/sslcert_viewer.h" #include "desktop/tree.h" diff --git a/frontends/riscos/textarea.c b/frontends/riscos/textarea.c index ecf3e0c3d..d9872927c 100644 --- a/frontends/riscos/textarea.c +++ b/frontends/riscos/textarea.c @@ -33,7 +33,6 @@ #include "utils/log.h" #include "utils/utf8.h" -#include "desktop/browser.h" #include "riscos/gui.h" #include "riscos/oslib_pre7.h" diff --git a/frontends/riscos/textselection.c b/frontends/riscos/textselection.c index 81ccc3a68..81274484a 100644 --- a/frontends/riscos/textselection.c +++ b/frontends/riscos/textselection.c @@ -16,9 +16,10 @@ * along with this program. If not, see . */ -/** \file - * Text selection code (platform-dependent implementation) - */ +/** + * \file + * RISC OS text selection implementation. + */ #include #include @@ -34,7 +35,7 @@ #include "netsurf/clipboard.h" #include "netsurf/window.h" #include "desktop/textinput.h" -#include "desktop/browser.h" +#include "netsurf/browser_window.h" #include "riscos/gui.h" #include "riscos/menus.h" diff --git a/frontends/riscos/theme_install.c b/frontends/riscos/theme_install.c index 5c11ffb83..3448e742f 100644 --- a/frontends/riscos/theme_install.c +++ b/frontends/riscos/theme_install.c @@ -30,7 +30,6 @@ #include "utils/messages.h" #include "content/content.h" #include "content/hlcache.h" -#include "desktop/browser.h" #include "desktop/theme.h" #include "riscos/dialog.h" diff --git a/frontends/riscos/treeview.c b/frontends/riscos/treeview.c index 3428ad3d4..83f60660f 100644 --- a/frontends/riscos/treeview.c +++ b/frontends/riscos/treeview.c @@ -40,7 +40,6 @@ #include "utils/messages.h" #include "utils/utils.h" #include "content/urldb.h" -#include "desktop/browser.h" #include "desktop/plotters.h" #include "desktop/textinput.h" #include "desktop/tree.h" diff --git a/frontends/riscos/uri.c b/frontends/riscos/uri.c index 9c384c9c0..a2f126b31 100644 --- a/frontends/riscos/uri.c +++ b/frontends/riscos/uri.c @@ -16,6 +16,11 @@ * along with this program. If not, see . */ +/** + * \file + * RISC OS URI message handling implementation. + */ + #include "utils/config.h" #include @@ -29,7 +34,7 @@ #include "utils/messages.h" #include "utils/nsurl.h" #include "content/fetch.h" -#include "desktop/browser.h" +#include "netsurf/browser_window.h" #include "riscos/gui.h" #include "riscos/uri.h" diff --git a/frontends/riscos/url_complete.c b/frontends/riscos/url_complete.c index 3cf7f9228..eebb76443 100644 --- a/frontends/riscos/url_complete.c +++ b/frontends/riscos/url_complete.c @@ -16,8 +16,9 @@ * along with this program. If not, see . */ -/** \file - * GUI URL auto-completion (implementation). +/** + * \file + * GUI URL auto-completion implementation. */ #include @@ -30,7 +31,7 @@ #include "utils/log.h" #include "utils/nsoption.h" #include "content/urldb.h" -#include "desktop/browser.h" +#include "netsurf/browser_window.h" #include "riscos/global_history.h" #include "riscos/gui.h" diff --git a/frontends/riscos/url_protocol.c b/frontends/riscos/url_protocol.c index 2b9ef3556..9a7ae062c 100644 --- a/frontends/riscos/url_protocol.c +++ b/frontends/riscos/url_protocol.c @@ -18,8 +18,9 @@ * along with this program. If not, see . */ -/** \file - * ANT URL launching protocol (implementation). +/** + * \file + * ANT URL launching protocol implementation. * * See http://www.vigay.com/inet/inet_url.html */ @@ -38,7 +39,7 @@ #include "utils/nsurl.h" #include "utils/config.h" #include "content/fetch.h" -#include "desktop/browser.h" +#include "netsurf/browser_window.h" #include "riscos/gui.h" #include "riscos/uri.h" diff --git a/frontends/riscos/window.c b/frontends/riscos/window.c index 2e012da99..1fc6edfbf 100644 --- a/frontends/riscos/window.c +++ b/frontends/riscos/window.c @@ -56,7 +56,7 @@ #include "content/hlcache.h" #include "content/urldb.h" #include "desktop/browser_history.h" -#include "desktop/browser.h" +#include "netsurf/browser_window.h" #include "desktop/cookie_manager.h" #include "desktop/scrollbar.h" #include "desktop/frames.h" -- cgit v1.2.3