Use qualified names in transformed expressions

diff --git a/codegen/valagdbusclienttransformer.vala b/codegen/valagdbusclienttransformer.vala
index 93ce6dff86e3d47cba868acc8d49305a5a8d177a..acfb2ae9ff4c86cb5cf26bec6b8c824759065d22 100644 (file)
--- a/codegen/valagdbusclienttransformer.vala
+++ b/codegen/valagdbusclienttransformer.vala
@@ -219,7 +219,7 @@ public class Vala.GDBusClientTransformer : GVariantTransformer {
                push_builder (new CodeBuilder.for_subroutine (m));
 
                b.open_switch (expression ("signal_name"), null);
-               b.add_expression (expression ("assert_not_reached ()"));
+               b.add_expression (expression ("GLib.assert_not_reached ()"));
                b.add_break ();
                foreach (var sig in sym.get_signals ()) {
                        if (sig.access != SymbolAccessibility.PUBLIC) {

diff --git a/codegen/valagdbusservertransformer.vala b/codegen/valagdbusservertransformer.vala
index 570c744e14d8f653613ee60f55d3e663bed1f876..22ae5b5c4b89d5ae60fe20abb1b60efa4de1b955 100644 (file)
--- a/codegen/valagdbusservertransformer.vala
+++ b/codegen/valagdbusservertransformer.vala
@@ -180,7 +180,7 @@ public class Vala.GDBusServerTransformer : GDBusClientTransformer {
 
                push_builder (new CodeBuilder.for_subroutine (im));
                var object_type = SemanticAnalyzer.get_data_type_for_symbol (sym);
-               var object = b.add_temp_declaration (null, expression (@"($object_type) (((Object[]) user_data)[0])"));
+               var object = b.add_temp_declaration (null, expression (@"($object_type) (((GLib.Object[]) user_data)[0])"));
                b.open_switch (expression ("method_name"), null);
                b.add_return ();
                foreach (var m in sym.get_methods ()) {
@@ -218,7 +218,7 @@ public class Vala.GDBusServerTransformer : GDBusClientTransformer {
 
                push_builder (new CodeBuilder.for_subroutine (m));
                var object_type = SemanticAnalyzer.get_data_type_for_symbol (sym);
-               var object = b.add_temp_declaration (null, expression (@"($object_type) (((Object[]) user_data)[0])"));
+               var object = b.add_temp_declaration (null, expression (@"($object_type) (((GLib.Object[]) user_data)[0])"));
                b.open_switch (expression ("property_name"), null);
                b.add_return (expression ("null"));
                foreach (var prop in sym.get_properties ()) {
@@ -255,7 +255,7 @@ public class Vala.GDBusServerTransformer : GDBusClientTransformer {
 
                push_builder (new CodeBuilder.for_subroutine (m));
                var object_type = SemanticAnalyzer.get_data_type_for_symbol (sym);
-               var object = b.add_temp_declaration (null, expression (@"($object_type) (((Object[]) user_data)[0])"));
+               var object = b.add_temp_declaration (null, expression (@"($object_type) (((GLib.Object[]) user_data)[0])"));
                b.open_switch (expression ("property_name"), null);
                b.add_return (expression ("false"));
                foreach (var prop in sym.get_properties ()) {