aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorThomas White <taw@bitwiz.org.uk>2011-11-06 17:31:08 +0100
committerThomas White <taw@bitwiz.org.uk>2011-11-06 17:31:08 +0100
commit0c645aa0a7d28a30b7f46916987f39d22531aa0a (patch)
treee7c695eb5ef7108bf925b28a0a05a5f725344f00 /src
parent1d03eefe14cf26c266670998eaa0c8d9a46a16de (diff)
Remove redundant parameter
Diffstat (limited to 'src')
-rw-r--r--src/loadsave.c8
-rw-r--r--src/presentation.h2
-rw-r--r--src/tool_image.c2
-rw-r--r--src/tool_text.c2
4 files changed, 7 insertions, 7 deletions
diff --git a/src/loadsave.c b/src/loadsave.c
index 1969265..8b7d9e1 100644
--- a/src/loadsave.c
+++ b/src/loadsave.c
@@ -504,7 +504,7 @@ static const char *type_text(enum objtype t)
static struct object *tree_to_object(struct presentation *p,
- struct ds_node *root, struct slide *s)
+ struct ds_node *root)
{
struct object *o = NULL;
char *v;
@@ -514,11 +514,11 @@ static struct object *tree_to_object(struct presentation *p,
switch ( text_to_type(v) ) {
case OBJ_TEXT :
- o = p->text_tool->deserialize(p, root, s, p->text_tool);
+ o = p->text_tool->deserialize(p, root, p->text_tool);
break;
case OBJ_IMAGE :
- o = p->image_tool->deserialize(p, root, s, p->image_tool);
+ o = p->image_tool->deserialize(p, root, p->image_tool);
break;
default :
@@ -544,7 +544,7 @@ static struct slide *tree_to_slide(struct presentation *p, struct ds_node *root)
struct object *o;
- o = tree_to_object(p, root->children[i], s);
+ o = tree_to_object(p, root->children[i]);
if ( o != NULL ) {
add_object_to_slide(s, o);
o->update_object(o);
diff --git a/src/presentation.h b/src/presentation.h
index b659ac7..854f824 100644
--- a/src/presentation.h
+++ b/src/presentation.h
@@ -95,7 +95,7 @@ struct toolinfo
void (*realise)(struct toolinfo *tip, GtkWidget *w);
struct object *(*deserialize)(struct presentation *p,
- struct ds_node *root, struct slide *s,
+ struct ds_node *root,
struct toolinfo *tip);
};
diff --git a/src/tool_image.c b/src/tool_image.c
index 2cb5cde..839cbc2 100644
--- a/src/tool_image.c
+++ b/src/tool_image.c
@@ -342,7 +342,7 @@ static int valid_object(struct object *o)
static struct object *deserialize(struct presentation *p, struct ds_node *root,
- struct slide *s, struct toolinfo *tip)
+ struct toolinfo *tip)
{
struct image_object *o;
double x, y, w, h;
diff --git a/src/tool_text.c b/src/tool_text.c
index 9f09e05..b371b7d 100644
--- a/src/tool_text.c
+++ b/src/tool_text.c
@@ -682,7 +682,7 @@ static void realise(struct toolinfo *tip, GtkWidget *w)
static struct object *deserialize(struct presentation *p, struct ds_node *root,
- struct slide *s, struct toolinfo *tip)
+ struct toolinfo *tip)
{
struct object *o;
struct text_object *to;