From: Juerg Billeter <j@bitron.ch>
Date: Fri, 11 Jan 2008 22:52:25 +0000 (+0000)
Subject: use parent_instance, parent_class, and parent_iface instead of just parent
X-Git-Tag: VALA_0_1_6~36
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8ae20627d23ea066c1a7fc829f03a13314c51689;p=platform%2Fupstream%2Fvala.git

use parent_instance, parent_class, and parent_iface instead of just parent

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

svn path=/trunk/; revision=831
---

diff --git a/ChangeLog b/ChangeLog
index be954cd..08c3afa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2008-01-11  Jürg 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
+
+2008-01-11  Jürg Billeter  <j@bitron.ch>
+
 	* vapi/packages/hildon-1/hildon-1.gi, vapi/hildon-1.vapi: regenerated,
 	  fixes issue with Hildon.BreadCrumb
 
diff --git a/gobject/valaccodegeneratorclass.vala b/gobject/valaccodegeneratorclass.vala
index 9a24981..0c7514b 100644
--- a/gobject/valaccodegeneratorclass.vala
+++ b/gobject/valaccodegeneratorclass.vala
@@ -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 @@ public class Vala.CCodeGenerator {
 		}
 
 		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 @@ public class Vala.CCodeGenerator {
 
 			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");
 			}
 		}
 
diff --git a/gobject/valaccodegeneratorinterface.vala b/gobject/valaccodegeneratorinterface.vala
index 82f47d6..2bf60ae 100644
--- a/gobject/valaccodegeneratorinterface.vala
+++ b/gobject/valaccodegeneratorinterface.vala
@@ -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 @@ public class Vala.CCodeGenerator {
 				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));