From 5f8b1497e1489e2b3c11e8a49f01770433115ee2 Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@kyllikki.org>
Date: Wed, 6 May 2020 23:38:50 +0100
Subject: clean up content headers and documentation comments

pure formatting and documentation changes, no code difference
---
 content/handlers/html/box_construct.c  | 3 ++-
 content/handlers/html/box_manipulate.c | 1 +
 content/handlers/html/box_special.c    | 1 +
 content/handlers/html/dom_event.c      | 1 +
 content/handlers/html/layout.c         | 1 +
 content/handlers/html/object.h         | 3 ++-
 content/handlers/html/private.h        | 4 ++--
 content/handlers/image/svg.c           | 1 +
 8 files changed, 11 insertions(+), 4 deletions(-)

(limited to 'content/handlers')

diff --git a/content/handlers/html/box_construct.c b/content/handlers/html/box_construct.c
index 3d100176a..5ae755211 100644
--- a/content/handlers/html/box_construct.c
+++ b/content/handlers/html/box_construct.c
@@ -33,6 +33,7 @@
 #include "utils/talloc.h"
 #include "utils/string.h"
 #include "utils/ascii.h"
+#include "utils/nsurl.h"
 #include "netsurf/misc.h"
 #include "css/select.h"
 #include "desktop/gui_internal.h"
@@ -68,7 +69,7 @@ struct box_construct_props {
 	/** Style from which to inherit, or NULL if none */
 	const css_computed_style *parent_style;
 	/** Current link target, or NULL if none */
-	nsurl *href;
+	struct nsurl *href;
 	/** Current frame target, or NULL if none */
 	const char *target;
 	/** Current title attribute, or NULL if none */
diff --git a/content/handlers/html/box_manipulate.c b/content/handlers/html/box_manipulate.c
index d88e360a1..d23091b7c 100644
--- a/content/handlers/html/box_manipulate.c
+++ b/content/handlers/html/box_manipulate.c
@@ -28,6 +28,7 @@
 
 #include "utils/errors.h"
 #include "utils/talloc.h"
+#include "utils/nsurl.h"
 #include "netsurf/types.h"
 #include "netsurf/mouse.h"
 #include "desktop/scrollbar.h"
diff --git a/content/handlers/html/box_special.c b/content/handlers/html/box_special.c
index 06f2f91d6..a369ec8ce 100644
--- a/content/handlers/html/box_special.c
+++ b/content/handlers/html/box_special.c
@@ -36,6 +36,7 @@
 #include "utils/talloc.h"
 #include "utils/string.h"
 #include "utils/ascii.h"
+#include "utils/nsurl.h"
 #include "netsurf/plot_style.h"
 #include "css/hints.h"
 #include "desktop/frame_types.h"
diff --git a/content/handlers/html/dom_event.c b/content/handlers/html/dom_event.c
index 4468e8296..08a1e45f2 100644
--- a/content/handlers/html/dom_event.c
+++ b/content/handlers/html/dom_event.c
@@ -27,6 +27,7 @@
 #include "utils/log.h"
 #include "utils/ascii.h"
 #include "utils/string.h"
+#include "utils/nsurl.h"
 #include "javascript/js.h"
 
 #include "html/private.h"
diff --git a/content/handlers/html/layout.c b/content/handlers/html/layout.c
index 3d022ab76..b87fd16c4 100644
--- a/content/handlers/html/layout.c
+++ b/content/handlers/html/layout.c
@@ -47,6 +47,7 @@
 #include "utils/talloc.h"
 #include "utils/utils.h"
 #include "utils/nsoption.h"
+#include "utils/nsurl.h"
 #include "netsurf/inttypes.h"
 #include "netsurf/content.h"
 #include "netsurf/browser_window.h"
diff --git a/content/handlers/html/object.h b/content/handlers/html/object.h
index 85734fd94..67d770c9e 100644
--- a/content/handlers/html/object.h
+++ b/content/handlers/html/object.h
@@ -27,6 +27,7 @@
 struct html_content;
 struct browser_window;
 struct box;
+struct nsurl;
 
 /**
  * Start a fetch for an object required by a page.
@@ -42,7 +43,7 @@ struct box;
  * \param background this is a background image
  * \return true on success, false on memory exhaustion
  */
-bool html_fetch_object(struct html_content *c, nsurl *url, struct box *box, content_type permitted_types, bool background);
+bool html_fetch_object(struct html_content *c, struct nsurl *url, struct box *box, content_type permitted_types, bool background);
 
 /**
  * release memory of content objects associated with a HTML content
diff --git a/content/handlers/html/private.h b/content/handlers/html/private.h
index 3d6d70674..dff0b7875 100644
--- a/content/handlers/html/private.h
+++ b/content/handlers/html/private.h
@@ -107,7 +107,7 @@ typedef struct html_content {
 	dom_hubbub_encoding_source encoding_source;
 
 	/** Base URL (may be a copy of content->url). */
-	nsurl *base_url;
+	struct nsurl *base_url;
 	/** Base target */
 	char *base_target;
 
@@ -341,7 +341,7 @@ struct form_control *html_forms_get_control_for_node(struct form *forms,
  * \return NSERROR_OK on successful registration or error code on failure.
  */
 nserror html_css_fetcher_register(void);
-nserror html_css_fetcher_add_item(dom_string *data, nsurl *base_url,
+nserror html_css_fetcher_add_item(dom_string *data, struct nsurl *base_url,
 		uint32_t *key);
 
 
diff --git a/content/handlers/image/svg.c b/content/handlers/image/svg.c
index 5124360e9..6194389bf 100644
--- a/content/handlers/image/svg.c
+++ b/content/handlers/image/svg.c
@@ -30,6 +30,7 @@
 
 #include "utils/messages.h"
 #include "utils/utils.h"
+#include "utils/nsurl.h"
 #include "netsurf/plotters.h"
 #include "netsurf/content.h"
 #include "content/content_protected.h"
-- 
cgit v1.2.3