vala-0.13.0 migration

diff --git a/configure.in b/configure.in
index 91e53659b477e4b7e09a70010148d6c6c3079318..fa3b2c84df698d0ab683bc5e0e5e4619ceafa8cf 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -20,8 +20,8 @@ AC_SUBST(VALAC)
 AC_SUBST(VALAFLAGS)
 
 
-VALA_PACKAGE=libvala-0.12
-LIBVALA_REQUIRED=0.11.0
+VALA_PACKAGE=libvala-0.14
+LIBVALA_REQUIRED=0.13.0
 LIBGEE_REQUIRED=0.5
 LIBGVC_REQUIRED=2.16
 GLIB_REQUIRED=2.12.0

diff --git a/src/libvaladoc/api/class.vala b/src/libvaladoc/api/class.vala
index 2a8ba76c4bb878c67458ff7fd50704ebaf0b29b0..3b8514562230298d810ea9709a559c1cc91eb42a 100644 (file)
--- a/src/libvaladoc/api/class.vala
+++ b/src/libvaladoc/api/class.vala
@@ -120,7 +120,7 @@ public class Valadoc.Api.Class : TypeSymbol {
         * Returns the dbus-name.
         */
        public string? get_dbus_name () {
-               return Vala.DBusModule.get_dbus_name ((Vala.TypeSymbol) symbol);
+               return Vala.GDBusModule.get_dbus_name ((Vala.TypeSymbol) symbol);
        }
 
        /**

diff --git a/src/libvaladoc/api/errorcode.vala b/src/libvaladoc/api/errorcode.vala
index f72d2127d16b8a8caa2c6d185f230a5b5b1b397c..7639867e1bda0ffe3ba1915d77a8b533025966c0 100644 (file)
--- a/src/libvaladoc/api/errorcode.vala
+++ b/src/libvaladoc/api/errorcode.vala
@@ -79,7 +79,7 @@ public class Valadoc.Api.ErrorCode : TypeSymbol {
         * Returns the dbus-name.
         */
        public string get_dbus_name () {
-               return Vala.DBusModule.get_dbus_name_for_member (symbol);
+               return Vala.GDBusModule.get_dbus_name_for_member (symbol);
        }
 
        /**

diff --git a/src/libvaladoc/api/errordomain.vala b/src/libvaladoc/api/errordomain.vala
index a03c440ca70ba2bf42fb5d18e4be448e42b8b0e5..061da441bdc5a68e4649b8c86e55ba0a3c3d99d8 100644 (file)
--- a/src/libvaladoc/api/errordomain.vala
+++ b/src/libvaladoc/api/errordomain.vala
@@ -43,7 +43,7 @@ public class Valadoc.Api.ErrorDomain : TypeSymbol {
         * Returns the dbus-name.
         */
        public string? get_dbus_name () {
-               return Vala.DBusModule.get_dbus_name ((Vala.TypeSymbol) symbol);
+               return Vala.GDBusModule.get_dbus_name ((Vala.TypeSymbol) symbol);
        }
 
        /**

diff --git a/src/libvaladoc/api/formalparameter.vala b/src/libvaladoc/api/formalparameter.vala
index 3fbe5f98453ac502e4b8fe914a25dd68a91542d4..1ba385f3e43ae062a6fa049c6f294365e7f78832 100644 (file)
--- a/src/libvaladoc/api/formalparameter.vala
+++ b/src/libvaladoc/api/formalparameter.vala
@@ -575,11 +575,11 @@ public class Valadoc.Api.FormalParameter : Symbol {
                        signature.append ("(", false);
 
                        bool first = true;
-                       foreach (string param in expr.get_parameters ()) {
+                       foreach (Vala.Parameter param in expr.get_parameters ()) {
                                if (!first) {
                                        signature.append (", ", false);
                                }
-                               signature.append (param, false);
+                               signature.append (param.name, false);
                                first = false;
                        }
 

diff --git a/src/libvaladoc/api/interface.vala b/src/libvaladoc/api/interface.vala
index 51adcf4f58f9f22b43d27179eb2e4d7f4a1e78d4..087ff5c32f7569428e0732ba7a9026959e3f9135 100644 (file)
--- a/src/libvaladoc/api/interface.vala
+++ b/src/libvaladoc/api/interface.vala
@@ -78,7 +78,7 @@ public class Valadoc.Api.Interface : TypeSymbol {
         * Returns the dbus-name.
         */
        public string? get_dbus_name () {
-               return Vala.DBusModule.get_dbus_name ((Vala.TypeSymbol) symbol);
+               return Vala.GDBusModule.get_dbus_name ((Vala.TypeSymbol) symbol);
        }
 
        /**

diff --git a/src/libvaladoc/api/method.vala b/src/libvaladoc/api/method.vala
index 6c09f6012b062d4bc55a7a32a92ccb19f53d9ddd..f09230ec4d0ebe2dac06b31c8162c4f52e888e5d 100644 (file)
--- a/src/libvaladoc/api/method.vala
+++ b/src/libvaladoc/api/method.vala
@@ -51,11 +51,11 @@ public class Valadoc.Api.Method : Member {
         * Returns the dbus-name.
         */
        public string get_dbus_name () {
-               return Vala.DBusModule.get_dbus_name_for_member (symbol);
+               return Vala.GDBusModule.get_dbus_name_for_member (symbol);
        }
 
        public string get_dbus_result_name () {
-               return Vala.DBusServerModule.dbus_result_name ((Vala.Method) symbol);
+               return Vala.GDBusServerModule.dbus_result_name ((Vala.Method) symbol);
        }
 
        /**
@@ -141,7 +141,7 @@ public class Valadoc.Api.Method : Member {
         */
        public bool is_dbus_visible {
                get {
-                       return Vala.DBusServerModule.is_dbus_visible (symbol);
+                       return Vala.GDBusServerModule.is_dbus_visible (symbol);
                }
        }
 

diff --git a/src/libvaladoc/api/property.vala b/src/libvaladoc/api/property.vala
index ade582cfe5d4927d3f945a59f0e956d1c1ee2771..06bebcd55a13e799ccb443a214227396ab4eebae 100644 (file)
--- a/src/libvaladoc/api/property.vala
+++ b/src/libvaladoc/api/property.vala
@@ -53,7 +53,7 @@ public class Valadoc.Api.Property : Member {
         * Returns the dbus-name.
         */
        public string get_dbus_name () {
-               return Vala.DBusModule.get_dbus_name_for_member (symbol);
+               return Vala.GDBusModule.get_dbus_name_for_member (symbol);
        }
 
        /**
@@ -95,7 +95,7 @@ public class Valadoc.Api.Property : Member {
         */
        public bool is_dbus_visible {
                get {
-                       return Vala.DBusServerModule.is_dbus_visible (symbol);
+                       return Vala.GDBusServerModule.is_dbus_visible (symbol);
                }
        }
 

diff --git a/src/libvaladoc/api/signal.vala b/src/libvaladoc/api/signal.vala
index ed16ba87d9c8c503480122b2da0ea8d140fce1b5..d28158875623a0fe96547eb09c3eb8b2834b313e 100644 (file)
--- a/src/libvaladoc/api/signal.vala
+++ b/src/libvaladoc/api/signal.vala
@@ -44,7 +44,7 @@ public class Valadoc.Api.Signal : Member {
         * Returns the dbus-name.
         */
        public string get_dbus_name () {
-               return Vala.DBusModule.get_dbus_name_for_member (symbol);
+               return Vala.GDBusModule.get_dbus_name_for_member (symbol);
        }
 
        /**
@@ -77,7 +77,7 @@ public class Valadoc.Api.Signal : Member {
         */
        public bool is_dbus_visible {
                get {
-                       return Vala.DBusServerModule.is_dbus_visible (symbol);
+                       return Vala.GDBusServerModule.is_dbus_visible (symbol);
                }
        }
 

diff --git a/src/libvaladoc/api/tree.vala b/src/libvaladoc/api/tree.vala
index 0073ead9b879ec33ad173d0dc77cd1137aa7f8c8..4485b3e469bb69d174ddbf086903a5600e76f738 100644 (file)
--- a/src/libvaladoc/api/tree.vala
+++ b/src/libvaladoc/api/tree.vala
@@ -191,7 +191,6 @@ public class Valadoc.Api.Tree {
 
                this.context.experimental = settings.experimental;
                this.context.experimental_non_null = settings.experimental || settings.experimental_non_null;
-               this.context.dbus_transformation = !settings.disable_dbus_transformation;
                this.context.vapi_directories = settings.vapi_directories;
 
                if (settings.verbose) {

diff --git a/src/libvaladoc/api/typereference.vala b/src/libvaladoc/api/typereference.vala
index 2899fd288d9bf607bdb08d44229ca7d03d001c92..af348641487b56bd3a1cbe88067dce212907ecd1 100644 (file)
--- a/src/libvaladoc/api/typereference.vala
+++ b/src/libvaladoc/api/typereference.vala
@@ -167,7 +167,7 @@ public class Valadoc.Api.TypeReference : Item {
 
        public string? get_dbus_type_signature () {
                if (vtyperef != null) {
-                       return Vala.DBusModule.get_type_signature (vtyperef);
+                       return Vala.GVariantModule.get_dbus_signature (vtyperef.data_type);
                } else {
                        return null;
                }

diff --git a/src/libvaladoc/settings.vala b/src/libvaladoc/settings.vala
index fe4388d309d0bfa8d86ccc28cfe369e8ef672fdf..baa8cb4af8ba5f3a8303daa61f3a456bd4647f0c 100755 (executable)
--- a/src/libvaladoc/settings.vala
+++ b/src/libvaladoc/settings.vala
@@ -90,12 +90,6 @@ public class Valadoc.Settings : Object {
         */
        public bool experimental_non_null;
 
-       /**
-        * Enable transformation of D-Bus member names in dynamic client support.
-        */
-       public bool disable_dbus_transformation;
-
-
        /**
         * Use the given profile (dova, gobject, posix, ...) instead of the defaul
         */

diff --git a/src/valadoc/valadoc.vala b/src/valadoc/valadoc.vala
index 223fbe2cc8a0562a5f7afcc75bf325d00151f7de..b4cb78fc0bebdd43a78986c3f6c98816a8169c45 100755 (executable)
--- a/src/valadoc/valadoc.vala
+++ b/src/valadoc/valadoc.vala
@@ -51,7 +51,6 @@ public class ValaDoc : Object {
        private static string[] defines;
        private static bool experimental;
        private static bool experimental_non_null = false;
-       private static bool disable_dbus_transformation;
        private static string profile;
        [CCode (array_length = false, array_null_terminated = true)]
        private static string[] import_packages;
@@ -69,7 +68,6 @@ public class ValaDoc : Object {
                { "define", 'D', 0, OptionArg.STRING_ARRAY, ref defines, "Define SYMBOL", "SYMBOL..." },
                { "enable-experimental", 0, 0, OptionArg.NONE, ref experimental, "Enable experimental features", null },
                { "enable-experimental-non-null", 0, 0, OptionArg.NONE, ref experimental_non_null, "Enable experimental enhancements for non-null types", null },
-               { "disable-dbus-transformation", 0, 0, OptionArg.NONE, ref disable_dbus_transformation, "Disable transformation of D-Bus member names", null },
                { "vapidir", 0, 0, OptionArg.FILENAME_ARRAY, ref vapi_directories, "Look for package bindings in DIRECTORY", "DIRECTORY..." },
                { "importdir", 0, 0, OptionArg.FILENAME_ARRAY, ref import_directories, "Look for external documentation in DIRECTORY", "DIRECTORY..." },
                { "profile", 0, 0, OptionArg.STRING, ref profile, "Use the given profile instead of the default", "PROFILE" },
@@ -148,7 +146,6 @@ public class ValaDoc : Object {
 
                settings.experimental = experimental;
                settings.experimental_non_null = experimental_non_null;
-               settings.disable_dbus_transformation = disable_dbus_transformation;
                settings.basedir = basedir;
                settings.directory = directory;
                settings.vapi_directories = vapi_directories;