Move construct property assignment to GObjectModule

2008-11-04  Jürg Billeter  <j@bitron.ch>

	* gobject/valaccodebasemodule.vala:
	* gobject/valagobjectmodule.vala:

	Move construct property assignment to GObjectModule

svn path=/trunk/; revision=1976

diff --git a/ChangeLog b/ChangeLog
index f148b735ffe38c7fa60883b0e9e26db31820eb3a..6a526c590dcc5fdba24359df23b494db7ca0a233 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-11-04  Jürg Billeter  <j@bitron.ch>
+
+       * gobject/valaccodebasemodule.vala:
+       * gobject/valagobjectmodule.vala:
+
+       Move construct property assignment to GObjectModule
+
 2008-11-04  Jürg Billeter  <j@bitron.ch>
 
        * gobject/valaccodeassignmentmodule.vala:

diff --git a/gobject/valaccodebasemodule.vala b/gobject/valaccodebasemodule.vala
index d0c007b06b8faba74acf05f4f20f52fa351823f6..8c90db4a15a4cb0801b55843a68f93483207cc8f 100644 (file)
--- a/gobject/valaccodebasemodule.vala
+++ b/gobject/valaccodebasemodule.vala
@@ -213,36 +213,6 @@ public class Vala.CCodeBaseModule : CCodeModule {
                }
        }
 
-       public override CCodeExpression get_construct_property_assignment (CCodeConstant canonical_cconstant, DataType property_type, CCodeExpression value) {
-               // this property is used as a construction parameter
-               var cpointer = new CCodeIdentifier ("__params_it");
-               
-               var ccomma = new CCodeCommaExpression ();
-               // set name in array for current parameter
-               var cnamemember = new CCodeMemberAccess.pointer (cpointer, "name");
-               var cnameassign = new CCodeAssignment (cnamemember, canonical_cconstant);
-               ccomma.append_expression (cnameassign);
-               
-               var gvaluearg = new CCodeUnaryExpression (CCodeUnaryOperator.ADDRESS_OF, new CCodeMemberAccess.pointer (cpointer, "value"));
-               
-               // initialize GValue in array for current parameter
-               var cvalueinit = new CCodeFunctionCall (new CCodeIdentifier ("g_value_init"));
-               cvalueinit.add_argument (gvaluearg);
-               cvalueinit.add_argument (new CCodeIdentifier (property_type.get_type_id ()));
-               ccomma.append_expression (cvalueinit);
-               
-               // set GValue for current parameter
-               var cvalueset = new CCodeFunctionCall (get_value_setter_function (property_type));
-               cvalueset.add_argument (gvaluearg);
-               cvalueset.add_argument (value);
-               ccomma.append_expression (cvalueset);
-               
-               // move pointer to next parameter in array
-               ccomma.append_expression (new CCodeUnaryExpression (CCodeUnaryOperator.POSTFIX_INCREMENT, cpointer));
-
-               return ccomma;
-       }
-
        private CCodeIncludeDirective get_internal_include (string filename) {
                return new CCodeIncludeDirective (filename, context.library == null);
        }

diff --git a/gobject/valagobjectmodule.vala b/gobject/valagobjectmodule.vala
index 29c1f1db9c0b514541ce5e18ff8d616f87e3233d..0417cfa83a36d4e241b977619291ee4a09374513 100644 (file)
--- a/gobject/valagobjectmodule.vala
+++ b/gobject/valagobjectmodule.vala
@@ -1453,5 +1453,35 @@ public class Vala.GObjectModule : GTypeModule {
 
                return cspec;
        }
+
+       public override CCodeExpression get_construct_property_assignment (CCodeConstant canonical_cconstant, DataType property_type, CCodeExpression value) {
+               // this property is used as a construction parameter
+               var cpointer = new CCodeIdentifier ("__params_it");
+               
+               var ccomma = new CCodeCommaExpression ();
+               // set name in array for current parameter
+               var cnamemember = new CCodeMemberAccess.pointer (cpointer, "name");
+               var cnameassign = new CCodeAssignment (cnamemember, canonical_cconstant);
+               ccomma.append_expression (cnameassign);
+               
+               var gvaluearg = new CCodeUnaryExpression (CCodeUnaryOperator.ADDRESS_OF, new CCodeMemberAccess.pointer (cpointer, "value"));
+               
+               // initialize GValue in array for current parameter
+               var cvalueinit = new CCodeFunctionCall (new CCodeIdentifier ("g_value_init"));
+               cvalueinit.add_argument (gvaluearg);
+               cvalueinit.add_argument (new CCodeIdentifier (property_type.get_type_id ()));
+               ccomma.append_expression (cvalueinit);
+               
+               // set GValue for current parameter
+               var cvalueset = new CCodeFunctionCall (get_value_setter_function (property_type));
+               cvalueset.add_argument (gvaluearg);
+               cvalueset.add_argument (value);
+               ccomma.append_expression (cvalueset);
+               
+               // move pointer to next parameter in array
+               ccomma.append_expression (new CCodeUnaryExpression (CCodeUnaryOperator.POSTFIX_INCREMENT, cpointer));
+
+               return ccomma;
+       }
 }