vala r831 - in trunk: . gobject

[juergbi svn gnome org]

Author: juergbi
Date: Fri Jan 11 22:52:25 2008
New Revision: 831
URL: http://svn.gnome.org/viewvc/vala?rev=831&view=rev

Log:
2008-01-11  Juerg Billeter  <j bitron ch>

	* gobject/valaccodegeneratorclass.vala,
	  gobject/valaccodegeneratorinterface.vala: use parent_instance,
	  parent_class, and parent_iface instead of just parent in C structs


Modified:
   trunk/ChangeLog
   trunk/gobject/valaccodegeneratorclass.vala
   trunk/gobject/valaccodegeneratorinterface.vala

Modified: trunk/gobject/valaccodegeneratorclass.vala
==============================================================================
--- trunk/gobject/valaccodegeneratorclass.vala	(original)
+++ trunk/gobject/valaccodegeneratorclass.vala	Fri Jan 11 22:52:25 2008
@@ -1,6 +1,6 @@
 /* valaccodegeneratorclass.vala
  *
- * Copyright (C) 2006-2007  JÃrg Billeter, Raffaele Sandrini
+ * Copyright (C) 2006-2008  JÃrg Billeter, Raffaele Sandrini
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -98,7 +98,7 @@
 		}
 
 		if (cl.base_class != null) {
-			instance_struct.add_field (cl.base_class.get_cname (), "parent");
+			instance_struct.add_field (cl.base_class.get_cname (), "parent_instance");
 			if (is_fundamental) {
 				instance_struct.add_field ("volatile int", "ref_count");
 			}
@@ -112,10 +112,10 @@
 
 			instance_struct.add_field ("%sPrivate *".printf (cl.get_cname ()), "priv");
 			if (is_fundamental) {
-				type_struct.add_field ("GTypeClass", "parent");
+				type_struct.add_field ("GTypeClass", "parent_class");
 				type_struct.add_field ("void", "(*finalize) (%s *self)".printf (cl.get_cname ()));
 			} else {
-				type_struct.add_field ("%sClass".printf (cl.base_class.get_cname ()), "parent");
+				type_struct.add_field ("%sClass".printf (cl.base_class.get_cname ()), "parent_class");
 			}
 		}
 

Modified: trunk/gobject/valaccodegeneratorinterface.vala
==============================================================================
--- trunk/gobject/valaccodegeneratorinterface.vala	(original)
+++ trunk/gobject/valaccodegeneratorinterface.vala	Fri Jan 11 22:52:25 2008
@@ -1,6 +1,6 @@
 /* valaccodegeneratorinterface.vala
  *
- * Copyright (C) 2006-2007  JÃrg Billeter, Raffaele Sandrini
+ * Copyright (C) 2006-2008  JÃrg Billeter, Raffaele Sandrini
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -67,7 +67,7 @@
 				decl_frag.append (new CCodeTypeDefinition ("struct %s".printf (type_struct.name), new CCodeVariableDeclarator (iface.get_type_cname ())));
 			}
 			
-			type_struct.add_field ("GTypeInterface", "parent");
+			type_struct.add_field ("GTypeInterface", "parent_iface");
 
 			if (iface.source_reference.comment != null) {
 				def_frag.append (new CCodeComment (iface.source_reference.comment));