Remove redundant parameter from content_open API

svn path=/trunk/netsurf/; revision=11964

8 files changed, 12 insertions, 15 deletions

diff --git a/amiga/plugin.c b/amiga/plugin.c
index b49fe349b..e21a7c2fc 100644
--- a/amiga/plugin.c
+++ b/amiga/plugin.c
@@ -137,12 +137,11 @@ bool plugin_redraw(struct content *c, int x, int y,
  * \param  bw      browser window containing the content
  * \param  page    content of type CONTENT_HTML containing c, or 0 if not an
  *                 object within a page
- * \param  index   index in page->data.html.object, or 0 if not an object
  * \param  box     box containing c, or 0 if not an object
  * \param  params  object parameters, or 0 if not an object
  */
 void plugin_open(struct content *c, struct browser_window *bw,
-	struct content *page, unsigned int index, struct box *box,
+	struct content *page, struct box *box,
 	struct object_params *params)
 {
 	LOG(("plugin_open"));
diff --git a/content/content.c b/content/content.c
index 427cc6313..95e5e049c 100644
--- a/content/content.c
+++ b/content/content.c
@@ -295,7 +295,7 @@ struct handler_entry {
 			float scale, colour background_colour,
 			bool repeat_x, bool repeat_y);
 	void (*open)(struct content *c, struct browser_window *bw,
-			struct content *page, unsigned int index,
+			struct content *page,
 			struct box *box,
 			struct object_params *params);
 	void (*close)(struct content *c);
@@ -1129,7 +1129,6 @@ void content_broadcast(struct content *c, content_msg msg,
  * \param  bw	   browser window containing the content
  * \param  page	   content of type CONTENT_HTML containing c, or 0 if not an
  *		   object within a page
- * \param  index   index in page->data.html.object, or 0 if not an object
  * \param  box	   box containing c, or 0 if not an object
  * \param  params  object parameters, or 0 if not an object
  *
@@ -1137,7 +1136,7 @@ void content_broadcast(struct content *c, content_msg msg,
  */
 
 void content_open(hlcache_handle *h, struct browser_window *bw,
-		struct content *page, unsigned int index, struct box *box,
+		struct content *page, struct box *box,
 		struct object_params *params)
 {
 	struct content *c = hlcache_handle_get_content(h);
@@ -1145,7 +1144,7 @@ void content_open(hlcache_handle *h, struct browser_window *bw,
 	assert(c->type < CONTENT_UNKNOWN);
 	LOG(("content %p %s", c, llcache_handle_get_url(c->llcache)));
 	if (handler_map[c->type].open)
-		handler_map[c->type].open(c, bw, page, index, box, params);
+		handler_map[c->type].open(c, bw, page, box, params);
 }
 
 
diff --git a/content/content.h b/content/content.h
index 66a1207d4..0bb40779f 100644
--- a/content/content.h
+++ b/content/content.h
@@ -132,7 +132,7 @@ bool content_redraw_tiled(struct hlcache_handle *h, int x, int y,
 		float scale, colour background_colour,
 		bool repeat_x, bool repeat_y);
 void content_open(struct hlcache_handle *h, struct browser_window *bw,
-		struct content *page, unsigned int index, struct box *box,
+		struct content *page, struct box *box, 
 		struct object_params *params);
 void content_close(struct hlcache_handle *h);
 
diff --git a/desktop/browser.c b/desktop/browser.c
index 04bbc3ac7..bf2415a15 100644
--- a/desktop/browser.c
+++ b/desktop/browser.c
@@ -546,7 +546,7 @@ nserror browser_window_callback(hlcache_handle *c,
 
 		/* new content; set scroll_to_top */
 		browser_window_update(bw, true);
-		content_open(c, bw, 0, 0, 0, 0);
+		content_open(c, bw, 0, 0, 0);
 		browser_window_set_status(bw, content_get_status_message(c));
 
 		/* history */
diff --git a/desktop/plugin.h b/desktop/plugin.h
index 3fb207e8e..b615c91af 100644
--- a/desktop/plugin.h
+++ b/desktop/plugin.h
@@ -50,7 +50,7 @@ bool plugin_redraw(struct content *c, int x, int y,
 		int width, int height, const struct rect *clip,
 		float scale, colour background_colour);
 void plugin_open(struct content *c, struct browser_window *bw,
-		struct content *page, unsigned int index, struct box *box,
+		struct content *page, struct box *box,
 		struct object_params *params);
 void plugin_close(struct content *c);
 bool plugin_clone(const struct content *old, struct content *new_content);
diff --git a/render/html.c b/render/html.c
index 8d5246855..bcce10ba4 100644
--- a/render/html.c
+++ b/render/html.c
@@ -1383,7 +1383,7 @@ nserror html_object_callback(hlcache_handle *object,
 			if (c->data.html.bw != NULL)
 				content_open(object,
 						c->data.html.bw, c,
-						0, box,
+						box,
 						box->object_params);
 			break;
 		}
@@ -1874,7 +1874,7 @@ void html_set_status(struct content *c, const char *extra)
  */
 
 void html_open(struct content *c, struct browser_window *bw,
-		struct content *page, unsigned int index, struct box *box,
+		struct content *page, struct box *box,
 		struct object_params *params)
 {
 	struct content_html_object *object, *next;
@@ -1893,7 +1893,7 @@ void html_open(struct content *c, struct browser_window *bw,
 			continue;
 
                	content_open(object->content,
-				bw, c, 0,
+				bw, c,
 				object->box,
 				object->box->object_params);
 	}
diff --git a/render/html.h b/render/html.h
index ac91f97f0..8789f30e6 100644
--- a/render/html.h
+++ b/render/html.h
@@ -201,7 +201,7 @@ bool html_fetch_object(struct content *c, const char *url, struct box *box,
 		bool background);
 void html_stop(struct content *c);
 void html_open(struct content *c, struct browser_window *bw,
-		struct content *page, unsigned int index, struct box *box,
+		struct content *page, struct box *box,
 		struct object_params *params);
 void html_close(struct content *c);
 void html_set_status(struct content *c, const char *extra);
diff --git a/riscos/plugin.c b/riscos/plugin.c
index c3065ed37..b70083831 100644
--- a/riscos/plugin.c
+++ b/riscos/plugin.c
@@ -264,12 +264,11 @@ bool plugin_redraw(struct content *c, int x, int y,
  * \param  bw      browser window containing the content
  * \param  page    content of type CONTENT_HTML containing c, or 0 if not an
  *                 object within a page
- * \param  index   index in page->data.html.object, or 0 if not an object
  * \param  box     box containing c, or 0 if not an object
  * \param  params  object parameters, or 0 if not an object
  */
 void plugin_open(struct content *c, struct browser_window *bw,
-		struct content *page, unsigned int index, struct box *box,
+		struct content *page, struct box *box,
 		struct object_params *params)
 {
 	bool standalone = false, helper = false;