From 976eca99580339c8cbb81819b54134de9ac8b97e Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Mon, 13 Jun 2016 23:34:45 +0100 Subject: msplit public url database API out for frontends --- frontends/amiga/gui.c | 3 ++- frontends/amiga/login.c | 4 ++-- frontends/amiga/stringview/urlhistory.c | 7 ++++--- frontends/amiga/tree.c | 1 - frontends/atari/gui.c | 3 ++- frontends/beos/cookies.cpp | 2 +- frontends/beos/gui.cpp | 4 +++- frontends/beos/window.cpp | 3 ++- frontends/cocoa/NetsurfApp.m | 4 +++- frontends/cocoa/URLFieldCell.m | 3 ++- frontends/framebuffer/gui.c | 2 +- frontends/gtk/completion.c | 5 +++-- frontends/gtk/gui.c | 3 ++- frontends/gtk/login.c | 2 +- frontends/monkey/main.c | 3 ++- frontends/riscos/401login.c | 2 +- frontends/riscos/gui.c | 3 ++- frontends/riscos/hotlist.c | 5 +++-- frontends/riscos/url_complete.c | 3 ++- frontends/riscos/url_suggest.c | 3 ++- frontends/riscos/window.c | 3 ++- 21 files changed, 42 insertions(+), 26 deletions(-) (limited to 'frontends') diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c index 9bd1cd4d0..afb49a574 100644 --- a/frontends/amiga/gui.c +++ b/frontends/amiga/gui.c @@ -103,9 +103,10 @@ #include "netsurf/netsurf.h" #include "netsurf/content.h" #include "netsurf/browser_window.h" +#include "netsurf/cookie_db.h" +#include "netsurf/url_db.h" #include "content/backing_store.h" #include "content/fetchers.h" -#include "content/urldb.h" #include "desktop/browser_history.h" #include "desktop/hotlist.h" #include "desktop/version.h" diff --git a/frontends/amiga/login.c b/frontends/amiga/login.c index d54c2fa15..3b338bfe5 100755 --- a/frontends/amiga/login.c +++ b/frontends/amiga/login.c @@ -39,10 +39,10 @@ #include #include "utils/messages.h" -#include "utils/errors.h" -#include "content/urldb.h" +#include "utils/nsurl.h" #include "netsurf/mouse.h" #include "netsurf/window.h" +#include "netsurf/url_db.h" #include "amiga/gui.h" #include "amiga/libs.h" diff --git a/frontends/amiga/stringview/urlhistory.c b/frontends/amiga/stringview/urlhistory.c index c58a3770b..7405fbb57 100644 --- a/frontends/amiga/stringview/urlhistory.c +++ b/frontends/amiga/stringview/urlhistory.c @@ -26,10 +26,11 @@ #include "amiga/os3support.h" -#include "urlhistory.h" - -#include "content/urldb.h" #include "utils/nsoption.h" +#include "utils/nsurl.h" +#include "netsurf/url_db.h" + +#include "urlhistory.h" static struct List PageList; diff --git a/frontends/amiga/tree.c b/frontends/amiga/tree.c index 7a6f8b3b5..033e356d6 100644 --- a/frontends/amiga/tree.c +++ b/frontends/amiga/tree.c @@ -55,7 +55,6 @@ #include "utils/messages.h" #include "netsurf/browser_window.h" #include "netsurf/window.h" -#include "content/urldb.h" #include "content/llcache.h" #include "desktop/cookie_manager.h" #include "desktop/global_history.h" diff --git a/frontends/atari/gui.c b/frontends/atari/gui.c index 36ef527cb..713db8bb3 100644 --- a/frontends/atari/gui.c +++ b/frontends/atari/gui.c @@ -37,7 +37,8 @@ #include "netsurf/misc.h" #include "netsurf/netsurf.h" #include "netsurf/content.h" -#include "content/urldb.h" +#include "netsurf/cookie_db.h" +#include "netsurf/url_db.h" #include "content/backing_store.h" #include "desktop/treeview.h" diff --git a/frontends/beos/cookies.cpp b/frontends/beos/cookies.cpp index 0a417a259..8e6801e43 100644 --- a/frontends/beos/cookies.cpp +++ b/frontends/beos/cookies.cpp @@ -24,7 +24,7 @@ extern "C" { #include "utils/log.h" #include "netsurf/mouse.h" #include "netsurf/plotters.h" -#include "content/urldb.h" +#include "netsurf/cookie_db.h" #include "desktop/cookie_manager.h" #include "desktop/tree.h" #include "desktop/textinput.h" diff --git a/frontends/beos/gui.cpp b/frontends/beos/gui.cpp index 63378257f..0dcbd6b6e 100644 --- a/frontends/beos/gui.cpp +++ b/frontends/beos/gui.cpp @@ -54,6 +54,7 @@ extern "C" { #include "utils/corestrings.h" #include "utils/utf8.h" #include "utils/utils.h" +#include "utils/nsurl.h" #include "netsurf/misc.h" #include "netsurf/clipboard.h" #include "netsurf/search.h" @@ -61,8 +62,9 @@ extern "C" { #include "netsurf/netsurf.h" #include "netsurf/content.h" #include "netsurf/browser_window.h" +#include "netsurf/cookie_db.h" +#include "netsurf/url_db.h" #include "content/fetchers.h" -#include "content/urldb.h" } diff --git a/frontends/beos/window.cpp b/frontends/beos/window.cpp index dd1e729ce..2944033fc 100644 --- a/frontends/beos/window.cpp +++ b/frontends/beos/window.cpp @@ -39,13 +39,14 @@ extern "C" { #include "utils/log.h" #include "utils/utf8.h" #include "utils/utils.h" +#include "utils/nsurl.h" #include "netsurf/content_type.h" #include "netsurf/browser_window.h" #include "netsurf/mouse.h" #include "netsurf/plotters.h" #include "netsurf/window.h" #include "netsurf/clipboard.h" -#include "content/urldb.h" +#include "netsurf/url_db.h" #include "desktop/textinput.h" } diff --git a/frontends/cocoa/NetsurfApp.m b/frontends/cocoa/NetsurfApp.m index 7584f4f05..520659121 100644 --- a/frontends/cocoa/NetsurfApp.m +++ b/frontends/cocoa/NetsurfApp.m @@ -32,11 +32,13 @@ #import "utils/messages.h" #import "utils/utils.h" #import "utils/nsoption.h" +#import "utils/nsurl.h" #import "netsurf/plotters.h" #import "netsurf/mouse.h" #import "netsurf/netsurf.h" #import "netsurf/browser_window.h" -#import "content/urldb.h" +#import "netsurf/cookie_db.h" +#import "netsurf/url_db.h" #import "desktop/save_complete.h" #import "desktop/textinput.h" #import "desktop/tree.h" diff --git a/frontends/cocoa/URLFieldCell.m b/frontends/cocoa/URLFieldCell.m index 1b4344b6c..e9e66476e 100644 --- a/frontends/cocoa/URLFieldCell.m +++ b/frontends/cocoa/URLFieldCell.m @@ -18,7 +18,8 @@ #import "cocoa/URLFieldCell.h" -#import "content/urldb.h" +#import "utils/nsurl.h" +#import "netsurf/url_db.h" @interface URLFieldCell () diff --git a/frontends/framebuffer/gui.c b/frontends/framebuffer/gui.c index 7ef64b0f0..68798866e 100644 --- a/frontends/framebuffer/gui.c +++ b/frontends/framebuffer/gui.c @@ -41,7 +41,7 @@ #include "netsurf/window.h" #include "netsurf/misc.h" #include "netsurf/netsurf.h" -#include "content/urldb.h" +#include "netsurf/cookie_db.h" #include "content/fetch.h" #include "framebuffer/gui.h" diff --git a/frontends/gtk/completion.c b/frontends/gtk/completion.c index 9b76411b6..eea0a789f 100644 --- a/frontends/gtk/completion.c +++ b/frontends/gtk/completion.c @@ -26,9 +26,10 @@ #include "utils/log.h" #include "utils/messages.h" #include "utils/nsoption.h" -#include "content/urldb.h" -#include "desktop/searchweb.h" +#include "utils/nsurl.h" +#include "netsurf/url_db.h" #include "netsurf/browser_window.h" +#include "desktop/searchweb.h" #include "gtk/warn.h" #include "gtk/scaffolding.h" diff --git a/frontends/gtk/gui.c b/frontends/gtk/gui.c index 3c7cdeb24..16d919967 100644 --- a/frontends/gtk/gui.c +++ b/frontends/gtk/gui.c @@ -39,7 +39,8 @@ #include "utils/file.h" #include "utils/nsoption.h" #include "content/fetchers.h" -#include "content/urldb.h" +#include "netsurf/url_db.h" +#include "netsurf/cookie_db.h" #include "content/backing_store.h" #include "netsurf/browser_window.h" #include "desktop/save_complete.h" diff --git a/frontends/gtk/login.c b/frontends/gtk/login.c index ee77052d7..3e29903fe 100644 --- a/frontends/gtk/login.c +++ b/frontends/gtk/login.c @@ -22,7 +22,7 @@ #include "utils/log.h" #include "utils/nsurl.h" -#include "content/urldb.h" +#include "netsurf/url_db.h" #include "gtk/resources.h" #include "gtk/login.h" diff --git a/frontends/monkey/main.c b/frontends/monkey/main.c index c9bb8ab52..0ddfd9a80 100644 --- a/frontends/monkey/main.c +++ b/frontends/monkey/main.c @@ -33,7 +33,8 @@ #include "utils/nsurl.h" #include "netsurf/misc.h" #include "netsurf/netsurf.h" -#include "content/urldb.h" +#include "netsurf/url_db.h" +#include "netsurf/cookie_db.h" #include "content/fetchers.h" #include "monkey/dispatch.h" diff --git a/frontends/riscos/401login.c b/frontends/riscos/401login.c index 35402ec53..a23c01c90 100644 --- a/frontends/riscos/401login.c +++ b/frontends/riscos/401login.c @@ -26,7 +26,7 @@ #include "utils/log.h" #include "utils/messages.h" #include "utils/nsurl.h" -#include "content/urldb.h" +#include "netsurf/url_db.h" #include "riscos/gui.h" #include "riscos/dialog.h" diff --git a/frontends/riscos/gui.c b/frontends/riscos/gui.c index 2e8f4333f..2b369ec8c 100644 --- a/frontends/riscos/gui.c +++ b/frontends/riscos/gui.c @@ -52,9 +52,10 @@ #include "netsurf/content.h" #include "netsurf/netsurf.h" #include "netsurf/browser_window.h" +#include "netsurf/cookie_db.h" +#include "netsurf/url_db.h" #include "desktop/save_complete.h" #include "desktop/treeview.h" -#include "content/urldb.h" #include "content/backing_store.h" #include "riscos/gui.h" diff --git a/frontends/riscos/hotlist.c b/frontends/riscos/hotlist.c index 1f5fc21d7..6041658c4 100644 --- a/frontends/riscos/hotlist.c +++ b/frontends/riscos/hotlist.c @@ -35,10 +35,11 @@ #include "utils/log.h" #include "utils/messages.h" #include "utils/nsoption.h" -#include "content/urldb.h" +#include "utils/nsurl.h" +#include "netsurf/url_db.h" +#include "netsurf/window.h" #include "desktop/hotlist.h" #include "desktop/tree.h" -#include "netsurf/window.h" #include "riscos/gui.h" #include "riscos/dialog.h" diff --git a/frontends/riscos/url_complete.c b/frontends/riscos/url_complete.c index eebb76443..3ca9be4c0 100644 --- a/frontends/riscos/url_complete.c +++ b/frontends/riscos/url_complete.c @@ -30,7 +30,8 @@ #include "utils/log.h" #include "utils/nsoption.h" -#include "content/urldb.h" +#include "utils/nsurl.h" +#include "netsurf/url_db.h" #include "netsurf/browser_window.h" #include "riscos/global_history.h" diff --git a/frontends/riscos/url_suggest.c b/frontends/riscos/url_suggest.c index ef1fcc71e..0d7b0eb42 100644 --- a/frontends/riscos/url_suggest.c +++ b/frontends/riscos/url_suggest.c @@ -26,7 +26,8 @@ #include #include "utils/messages.h" -#include "content/urldb.h" +#include "utils/nsurl.h" +#include "netsurf/url_db.h" #include "riscos/menus.h" #include "riscos/url_suggest.h" diff --git a/frontends/riscos/window.c b/frontends/riscos/window.c index 35efefb0b..152bff351 100644 --- a/frontends/riscos/window.c +++ b/frontends/riscos/window.c @@ -51,12 +51,13 @@ #include "utils/utils.h" #include "utils/messages.h" #include "utils/string.h" +#include "utils/nsurl.h" #include "netsurf/content.h" #include "netsurf/browser_window.h" #include "netsurf/plotters.h" #include "netsurf/window.h" #include "netsurf/bitmap.h" -#include "content/urldb.h" +#include "netsurf/url_db.h" #include "desktop/browser_history.h" #include "desktop/cookie_manager.h" #include "desktop/scrollbar.h" -- cgit v1.2.3