[vala/staging] codegen: Rename *_instance_init to *_init to match G_DEFINE_TYPE_* macros



commit 68107cc05918e607482815adbef74ec4361379cb
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Sun Apr 1 13:08:24 2018 +0200

    codegen: Rename *_instance_init to *_init to match G_DEFINE_TYPE_* macros

 codegen/valaccodemethodcallmodule.vala |    2 +-
 codegen/valaccodemethodmodule.vala     |    2 +-
 codegen/valaclassregisterfunction.vala |    2 +-
 codegen/valagtypemodule.vala           |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/codegen/valaccodemethodcallmodule.vala b/codegen/valaccodemethodcallmodule.vala
index fb78e59..1667f99 100644
--- a/codegen/valaccodemethodcallmodule.vala
+++ b/codegen/valaccodemethodcallmodule.vala
@@ -877,7 +877,7 @@ public class Vala.CCodeMethodCallModule : CCodeAssignmentModule {
                }
 
                if (m is CreationMethod && m.parent_symbol is Class && ((current_class.is_compact && 
current_class.base_class != null) || current_class.base_class == gsource_type)) {
-                       var cinitcall = new CCodeFunctionCall (new CCodeIdentifier ("%s_instance_init".printf 
(get_ccode_lower_case_name (current_class, null))));
+                       var cinitcall = new CCodeFunctionCall (new CCodeIdentifier ("%s_init".printf 
(get_ccode_lower_case_name (current_class, null))));
                        cinitcall.add_argument (get_this_cexpression ());
                        ccode.add_expression (cinitcall);
                }
diff --git a/codegen/valaccodemethodmodule.vala b/codegen/valaccodemethodmodule.vala
index 66e3ad1..c43909e 100644
--- a/codegen/valaccodemethodmodule.vala
+++ b/codegen/valaccodemethodmodule.vala
@@ -655,7 +655,7 @@ public abstract class Vala.CCodeMethodModule : CCodeStructModule {
                                                }
 
                                                if (cl.base_class == null) {
-                                                       var cinitcall = new CCodeFunctionCall (new 
CCodeIdentifier ("%s_instance_init".printf (get_ccode_lower_case_name (cl, null))));
+                                                       var cinitcall = new CCodeFunctionCall (new 
CCodeIdentifier ("%s_init".printf (get_ccode_lower_case_name (cl, null))));
                                                        cinitcall.add_argument (get_this_cexpression ());
                                                        ccode.add_expression (cinitcall);
                                                }
diff --git a/codegen/valaclassregisterfunction.vala b/codegen/valaclassregisterfunction.vala
index b4906d5..466faa9 100644
--- a/codegen/valaclassregisterfunction.vala
+++ b/codegen/valaclassregisterfunction.vala
@@ -82,7 +82,7 @@ public class Vala.ClassRegisterFunction : TypeRegisterFunction {
        }
 
        public override string get_instance_init_func_name () {
-               return "%s_instance_init".printf (get_ccode_lower_case_name (class_reference, null));
+               return "%s_init".printf (get_ccode_lower_case_name (class_reference, null));
        }
 
        public override string get_parent_type_name () {
diff --git a/codegen/valagtypemodule.vala b/codegen/valagtypemodule.vala
index abb19f6..9554908 100644
--- a/codegen/valagtypemodule.vala
+++ b/codegen/valagtypemodule.vala
@@ -1611,7 +1611,7 @@ public class Vala.GTypeModule : GErrorModule {
        private void begin_instance_init_function (Class cl) {
                push_context (instance_init_context);
 
-               var func = new CCodeFunction ("%s_instance_init".printf (get_ccode_lower_case_name (cl, 
null)));
+               var func = new CCodeFunction ("%s_init".printf (get_ccode_lower_case_name (cl, null)));
                func.add_parameter (new CCodeParameter ("self", "%s *".printf (get_ccode_name (cl))));
                func.modifiers = CCodeModifiers.STATIC;
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]