From 76a68d7dd02f3819e4e60cd9febfd45e20821e14 Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@kyllikki.org>
Date: Mon, 6 Jun 2016 08:59:23 +0100
Subject: Update content to split public and internal API

---
 frontends/riscos/bitmap.c                    |  2 +-
 frontends/riscos/content-handlers/artworks.c |  4 +++-
 frontends/riscos/content-handlers/draw.c     |  4 +++-
 frontends/riscos/content-handlers/sprite.c   |  4 +++-
 frontends/riscos/filetype.c                  |  8 +++----
 frontends/riscos/filetype.h                  |  2 +-
 frontends/riscos/gui.c                       |  8 +++----
 frontends/riscos/gui/url_bar.c               | 10 ++++-----
 frontends/riscos/print.c                     | 14 ++++++------
 frontends/riscos/save.c                      | 32 ++++++++++++++--------------
 frontends/riscos/save_draw.c                 |  5 ++---
 frontends/riscos/search.c                    |  5 ++---
 frontends/riscos/theme_install.c             |  2 +-
 frontends/riscos/url_suggest.c               |  5 ++---
 frontends/riscos/window.c                    | 14 +++++-------
 15 files changed, 58 insertions(+), 61 deletions(-)

(limited to 'frontends/riscos')

diff --git a/frontends/riscos/bitmap.c b/frontends/riscos/bitmap.c
index e0fd38ba8..1a3524633 100644
--- a/frontends/riscos/bitmap.c
+++ b/frontends/riscos/bitmap.c
@@ -44,8 +44,8 @@
 #include "utils/log.h"
 #include "utils/messages.h"
 #include "netsurf/plotters.h"
-#include "content/content.h"
 #include "netsurf/bitmap.h"
+#include "netsurf/content.h"
 
 #include "riscos/gui.h"
 #include "riscos/image.h"
diff --git a/frontends/riscos/content-handlers/artworks.c b/frontends/riscos/content-handlers/artworks.c
index 517a6ff16..f70b10ac7 100644
--- a/frontends/riscos/content-handlers/artworks.c
+++ b/frontends/riscos/content-handlers/artworks.c
@@ -36,8 +36,10 @@
 #include "utils/log.h"
 #include "utils/messages.h"
 #include "utils/utils.h"
-#include "content/content_protected.h"
 #include "netsurf/plotters.h"
+#include "netsurf/content.h"
+#include "content/content_protected.h"
+#include "content/llcache.h"
 
 #include "riscos/content-handlers/artworks.h"
 #include "riscos/gui.h"
diff --git a/frontends/riscos/content-handlers/draw.c b/frontends/riscos/content-handlers/draw.c
index 0b1b07215..9dff75736 100644
--- a/frontends/riscos/content-handlers/draw.c
+++ b/frontends/riscos/content-handlers/draw.c
@@ -33,8 +33,10 @@
 #include "utils/log.h"
 #include "utils/messages.h"
 #include "utils/utils.h"
-#include "content/content_protected.h"
 #include "netsurf/plotters.h"
+#include "netsurf/content.h"
+#include "content/content_protected.h"
+#include "content/llcache.h"
 
 #include "riscos/content-handlers/draw.h"
 #include "riscos/gui.h"
diff --git a/frontends/riscos/content-handlers/sprite.c b/frontends/riscos/content-handlers/sprite.c
index 3ef48c889..ed06110ec 100644
--- a/frontends/riscos/content-handlers/sprite.c
+++ b/frontends/riscos/content-handlers/sprite.c
@@ -32,8 +32,10 @@
 #include "utils/log.h"
 #include "utils/messages.h"
 #include "utils/utils.h"
-#include "content/content_protected.h"
 #include "netsurf/plotters.h"
+#include "netsurf/content.h"
+#include "content/llcache.h"
+#include "content/content_protected.h"
 
 #include "riscos/gui.h"
 #include "riscos/image.h"
diff --git a/frontends/riscos/filetype.c b/frontends/riscos/filetype.c
index 99a44ae30..75ff41414 100644
--- a/frontends/riscos/filetype.c
+++ b/frontends/riscos/filetype.c
@@ -24,9 +24,7 @@
 
 #include "utils/config.h"
 #include "utils/log.h"
-#include "content/content.h"
-#include "content/fetch.h"
-#include "content/hlcache.h"
+#include "netsurf/content.h"
 
 #include "riscos/filetype.h"
 #include "riscos/gui.h"
@@ -232,7 +230,7 @@ int cmp_type(const void *x, const void *y)
 }
 
 /* exported interface documented in riscos/filetype.h */
-int ro_content_filetype(hlcache_handle *c)
+int ro_content_filetype(struct hlcache_handle *c)
 {
 	lwc_string *mime_type;
 	int file_type;
@@ -252,7 +250,7 @@ int ro_content_filetype(hlcache_handle *c)
 
 
 /* exported interface documented in riscos/filetype.h */
-int ro_content_native_type(hlcache_handle *c)
+int ro_content_native_type(struct hlcache_handle *c)
 {
 	switch (ro_content_filetype(c)) {
 	case FILETYPE_JPEG: /* jpeg */
diff --git a/frontends/riscos/filetype.h b/frontends/riscos/filetype.h
index 3ba613033..4c45e7bd0 100644
--- a/frontends/riscos/filetype.h
+++ b/frontends/riscos/filetype.h
@@ -23,7 +23,7 @@
 #ifndef _NETSURF_RISCOS_FILETYPE_H_
 #define _NETSURF_RISCOS_FILETYPE_H_
 
-#include "content/content_type.h"
+#include "netsurf/content_type.h"
 
 #ifndef FILETYPE_ACORN_URI
 #define FILETYPE_ACORN_URI 0xf91
diff --git a/frontends/riscos/gui.c b/frontends/riscos/gui.c
index e0e8e4e3b..2e8f4333f 100644
--- a/frontends/riscos/gui.c
+++ b/frontends/riscos/gui.c
@@ -49,12 +49,12 @@
 #include "utils/corestrings.h"
 #include "netsurf/fetch.h"
 #include "netsurf/misc.h"
-#include "desktop/save_complete.h"
-#include "desktop/treeview.h"
+#include "netsurf/content.h"
 #include "netsurf/netsurf.h"
 #include "netsurf/browser_window.h"
+#include "desktop/save_complete.h"
+#include "desktop/treeview.h"
 #include "content/urldb.h"
-#include "content/hlcache.h"
 #include "content/backing_store.h"
 
 #include "riscos/gui.h"
@@ -1935,7 +1935,7 @@ static void ro_gui_view_source_bounce(wimp_message *message)
 /**
  * Send the source of a content to a text editor.
  */
-void ro_gui_view_source(hlcache_handle *c)
+void ro_gui_view_source(struct hlcache_handle *c)
 {
 	os_error *error;
 	char *temp_name;
diff --git a/frontends/riscos/gui/url_bar.c b/frontends/riscos/gui/url_bar.c
index 80a7b4a40..547c4608d 100644
--- a/frontends/riscos/gui/url_bar.c
+++ b/frontends/riscos/gui/url_bar.c
@@ -17,8 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** \file
- * URL bars (implementation).
+/**
+ * \file
+ * RISC OS URL bar implementation.
  */
 
 #include <alloca.h>
@@ -35,15 +36,14 @@
 #include "utils/messages.h"
 #include "utils/utf8.h"
 #include "utils/utils.h"
-#include "content/hlcache.h"
-#include "content/content.h"
 #include "netsurf/browser_window.h"
 #include "netsurf/plotters.h"
+#include "netsurf/content.h"
+#include "content/hlcache.h"
 
 #include "riscos/gui.h"
 #include "riscos/hotlist.h"
 #include "riscos/gui/url_bar.h"
-#include "riscos/theme.h"
 #include "riscos/url_suggest.h"
 #include "riscos/wimp.h"
 #include "riscos/wimp_event.h"
diff --git a/frontends/riscos/print.c b/frontends/riscos/print.c
index da16664ac..dfdd24ce9 100644
--- a/frontends/riscos/print.c
+++ b/frontends/riscos/print.c
@@ -36,10 +36,10 @@
 #include "utils/messages.h"
 #include "utils/utils.h"
 #include "utils/nsoption.h"
-#include "content/content.h"
-#include "content/hlcache.h"
 #include "netsurf/browser_window.h"
 #include "netsurf/plotters.h"
+#include "netsurf/content.h"
+#include "content/content.h"
 
 #include "riscos/gui.h"
 #include "riscos/dialog.h"
@@ -101,10 +101,10 @@ void gui_window_redraw_window(struct gui_window *g);
 static bool ro_gui_print_click(wimp_pointer *pointer);
 static bool ro_gui_print_apply(wimp_w w);
 static void print_update_sheets_shaded_state(bool on);
-static void print_send_printsave(hlcache_handle *h);
+static void print_send_printsave(struct hlcache_handle *h);
 static bool print_send_printtypeknown(wimp_message *m);
 static bool print_document(struct gui_window *g, const char *filename);
-static const char *print_declare_fonts(hlcache_handle *h);
+static const char *print_declare_fonts(struct hlcache_handle *h);
 static bool print_fonts_plot_rectangle(int x0, int y0, int x1, int y1, const plot_style_t *style);
 static bool print_fonts_plot_line(int x0, int y0, int x1, int y1, const plot_style_t *style);
 static bool print_fonts_plot_polygon(const int *p, unsigned int n, const plot_style_t *style);
@@ -312,7 +312,7 @@ void print_update_sheets_shaded_state(bool on)
  * \param h handle to content to print.
  */
 
-void print_send_printsave(hlcache_handle *h)
+void print_send_printsave(struct hlcache_handle *h)
 {
 	wimp_full_message_data_xfer m;
 	os_error *e;
@@ -546,7 +546,7 @@ bool print_document(struct gui_window *g, const char *filename)
 	int left, right, top, bottom, width, height;
 	int saved_width, saved_height;
 	int yscroll = 0, sheets = print_max_sheets;
-	hlcache_handle *h = browser_window_get_content(g->bw);
+	struct hlcache_handle *h = browser_window_get_content(g->bw);
 	const char *error_message;
 	pdriver_features features;
 	os_fw fhandle, old_job = 0;
@@ -788,7 +788,7 @@ error:
  * \return 0 on success, error message on error
  */
 
-const char *print_declare_fonts(hlcache_handle *h)
+const char *print_declare_fonts(struct hlcache_handle *h)
 {
 	unsigned int i;
 	struct rect clip;
diff --git a/frontends/riscos/save.c b/frontends/riscos/save.c
index 325dbbb79..a028fcd09 100644
--- a/frontends/riscos/save.c
+++ b/frontends/riscos/save.c
@@ -40,8 +40,8 @@
 #include "utils/log.h"
 #include "utils/messages.h"
 #include "utils/utf8.h"
-#include "content/content.h"
-#include "content/hlcache.h"
+#include "utils/nsurl.h"
+#include "netsurf/content.h"
 #include "netsurf/browser_window.h"
 #include "desktop/hotlist.h"
 #include "desktop/global_history.h"
@@ -81,7 +81,7 @@
           now since we could have multiple saves outstanding */
 
 static gui_save_type gui_save_current_type;
-static hlcache_handle *gui_save_content = NULL;
+static struct hlcache_handle *gui_save_content = NULL;
 static char *gui_save_selection = NULL;
 static const char *gui_save_url = NULL;
 static const char *gui_save_title = NULL;
@@ -105,17 +105,17 @@ static size_t save_dir_len;
 
 typedef enum { LINK_ACORN, LINK_ANT, LINK_TEXT } link_format;
 
-static bool ro_gui_save_complete(hlcache_handle *h, char *path);
-static bool ro_gui_save_content(hlcache_handle *h, char *path, bool force_overwrite);
+static bool ro_gui_save_complete(struct hlcache_handle *h, char *path);
+static bool ro_gui_save_content(struct hlcache_handle *h, char *path, bool force_overwrite);
 static void ro_gui_save_done(void);
 static void ro_gui_save_bounced(wimp_message *message);
-static bool ro_gui_save_object_native(hlcache_handle *h, char *path);
+static bool ro_gui_save_object_native(struct hlcache_handle *h, char *path);
 static bool ro_gui_save_link(const char *url, const char *title, link_format format, char *path);
-static void ro_gui_save_set_state(hlcache_handle *h, gui_save_type save_type,
+static void ro_gui_save_set_state(struct hlcache_handle *h, gui_save_type save_type,
 		const nsurl *url, char *leaf_buf, size_t leaf_len,
 		char *icon_buf, size_t icon_len);
 static void ro_gui_save_drag_end(wimp_dragged *drag, void *data);
-static bool ro_gui_save_create_thumbnail(hlcache_handle *h, const char *name);
+static bool ro_gui_save_create_thumbnail(struct hlcache_handle *h, const char *name);
 static void ro_gui_save_overwrite_confirmed(query_id, enum query_response res, void *p);
 static void ro_gui_save_overwrite_cancelled(query_id, enum query_response res, void *p);
 
@@ -247,7 +247,7 @@ void ro_gui_saveas_quit(void)
  * \param  title      title (if any), when saving links
  */
 
-void ro_gui_save_prepare(gui_save_type save_type, hlcache_handle *h,
+void ro_gui_save_prepare(gui_save_type save_type, struct hlcache_handle *h,
 		char *s, const nsurl *url, const char *title)
 {
 	char name_buf[FILENAME_MAX];
@@ -364,7 +364,7 @@ bool ro_gui_save_ok(wimp_w w)
  * \param  g          gui window
  */
 
-void gui_drag_save_object(struct gui_window *g, hlcache_handle *c,
+void gui_drag_save_object(struct gui_window *g, struct hlcache_handle *c,
 		gui_save_type save_type)
 {
 	wimp_pointer pointer;
@@ -741,7 +741,7 @@ void ro_gui_save_bounced(wimp_message *message)
 void ro_gui_save_datasave_ack(wimp_message *message)
 {
 	char *path = message->data.data_xfer.file_name;
-	hlcache_handle *h = gui_save_content;
+	struct hlcache_handle *h = gui_save_content;
 	bool force_overwrite;
 
 	switch (gui_save_current_type) {
@@ -793,7 +793,7 @@ void ro_gui_save_datasave_ack(wimp_message *message)
  *               or (ii) deferred awaiting user confirmation
  */
 
-bool ro_gui_save_content(hlcache_handle *h, char *path, bool force_overwrite)
+bool ro_gui_save_content(struct hlcache_handle *h, char *path, bool force_overwrite)
 {
 	os_error *error;
 	const char *source_data;
@@ -1008,7 +1008,7 @@ static void ro_gui_save_set_file_type(const char *path, lwc_string *mime_type)
  * \return  true on success, false on error and error reported
  */
 
-bool ro_gui_save_complete(hlcache_handle *h, char *path)
+bool ro_gui_save_complete(struct hlcache_handle *h, char *path)
 {
 	void *spr = ((byte *) saveas_area) + saveas_area->first;
 	osspriteop_header *sprite = (osspriteop_header *) spr;
@@ -1093,7 +1093,7 @@ bool ro_gui_save_complete(hlcache_handle *h, char *path)
 	return save_complete(h, path, ro_gui_save_set_file_type);
 }
 
-bool ro_gui_save_object_native(hlcache_handle *h, char *path)
+bool ro_gui_save_object_native(struct hlcache_handle *h, char *path)
 {
 	int file_type = ro_content_filetype(h);
 
@@ -1200,7 +1200,7 @@ bool ro_gui_save_link(const char *url, const char *title, link_format format,
  * \param  icon_len   size of buffer to receive icon name.
  */
 
-void ro_gui_save_set_state(hlcache_handle *h, gui_save_type save_type,
+void ro_gui_save_set_state(struct hlcache_handle *h, gui_save_type save_type,
 		const nsurl *url, char *leaf_buf, size_t leaf_len,
 		char *icon_buf, size_t icon_len)
 {
@@ -1338,7 +1338,7 @@ void ro_gui_save_set_state(hlcache_handle *h, gui_save_type save_type,
  * \return true iff successful
  */
 
-bool ro_gui_save_create_thumbnail(hlcache_handle *h, const char *name)
+bool ro_gui_save_create_thumbnail(struct hlcache_handle *h, const char *name)
 {
 	osspriteop_header *sprite_header;
 	struct bitmap *bitmap;
diff --git a/frontends/riscos/save_draw.c b/frontends/riscos/save_draw.c
index 7ba2c942b..705551f7b 100644
--- a/frontends/riscos/save_draw.c
+++ b/frontends/riscos/save_draw.c
@@ -32,9 +32,8 @@
 
 #include "utils/log.h"
 #include "utils/utils.h"
-#include "content/content.h"
-#include "content/hlcache.h"
 #include "netsurf/plotters.h"
+#include "netsurf/content.h"
 
 #include "riscos/bitmap.h"
 #include "riscos/gui.h"
@@ -87,7 +86,7 @@ static int ro_save_draw_height;
  * \return  true on success, false on error and error reported
  */
 
-bool save_as_draw(hlcache_handle *h, const char *path)
+bool save_as_draw(struct hlcache_handle *h, const char *path)
 {
 	pencil_code code;
 	char *drawfile_buffer;
diff --git a/frontends/riscos/search.c b/frontends/riscos/search.c
index 544630e2e..9ed898e50 100644
--- a/frontends/riscos/search.c
+++ b/frontends/riscos/search.c
@@ -31,10 +31,9 @@
 
 #include "utils/log.h"
 #include "utils/messages.h"
-#include "content/content.h"
-#include "content/hlcache.h"
 #include "netsurf/browser_window.h"
 #include "netsurf/search.h"
+#include "netsurf/content.h"
 #include "desktop/search.h"
 
 #include "riscos/gui.h"
@@ -269,7 +268,7 @@ bool ro_gui_search_prepare_menu(void)
  */
 static bool ro_gui_search_bw_searchable(struct browser_window *bw)
 {
-	hlcache_handle *h;
+	struct hlcache_handle *h;
 
 	assert(bw != NULL);
 
diff --git a/frontends/riscos/theme_install.c b/frontends/riscos/theme_install.c
index 3448e742f..fee126a86 100644
--- a/frontends/riscos/theme_install.c
+++ b/frontends/riscos/theme_install.c
@@ -28,7 +28,7 @@
 #include "utils/nsoption.h"
 #include "utils/log.h"
 #include "utils/messages.h"
-#include "content/content.h"
+#include "netsurf/content.h"
 #include "content/hlcache.h"
 #include "desktop/theme.h"
 
diff --git a/frontends/riscos/url_suggest.c b/frontends/riscos/url_suggest.c
index 3f6b6b54d..ef1fcc71e 100644
--- a/frontends/riscos/url_suggest.c
+++ b/frontends/riscos/url_suggest.c
@@ -23,14 +23,13 @@
 #include <assert.h>
 #include <string.h>
 #include <stdlib.h>
+#include <oslib/wimp.h>
 
-#include "oslib/wimp.h"
-#include "content/content_type.h"
+#include "utils/messages.h"
 #include "content/urldb.h"
 
 #include "riscos/menus.h"
 #include "riscos/url_suggest.h"
-#include "utils/messages.h"
 
 struct url_suggest_item {
 	const char		*url;	/*< The URL being stored.         */
diff --git a/frontends/riscos/window.c b/frontends/riscos/window.c
index e99ed31e3..cbd743f65 100644
--- a/frontends/riscos/window.c
+++ b/frontends/riscos/window.c
@@ -43,7 +43,6 @@
 #include <oslib/wimpspriteop.h>
 #include <nsutils/time.h>
 
-#include "utils/config.h"
 #include "utils/nsoption.h"
 #include "utils/log.h"
 #include "utils/talloc.h"
@@ -52,20 +51,17 @@
 #include "utils/utils.h"
 #include "utils/messages.h"
 #include "utils/string.h"
-#include "content/content.h"
+#include "netsurf/content.h"
+#include "netsurf/browser_window.h"
+#include "netsurf/plotters.h"
+#include "netsurf/window.h"
+#include "netsurf/bitmap.h"
 #include "content/hlcache.h"
 #include "content/urldb.h"
 #include "desktop/browser_history.h"
-#include "netsurf/browser_window.h"
 #include "desktop/cookie_manager.h"
 #include "desktop/scrollbar.h"
-#include "desktop/frames.h"
-#include "netsurf/mouse.h"
-#include "netsurf/plotters.h"
 #include "desktop/textinput.h"
-#include "desktop/tree.h"
-#include "netsurf/window.h"
-#include "netsurf/bitmap.h"
 #include "render/form.h"
 
 #include "riscos/bitmap.h"
-- 
cgit v1.2.3