From: Florian Brosch Date: Thu, 7 Jul 2011 13:47:40 +0000 (+0200) Subject: vala-0.13.0 migration X-Git-Tag: 0.37.1~3^2~330 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f7501ab4989f980e2a6f718efcc3825b27a2f36;p=thirdparty%2Fvala.git vala-0.13.0 migration --- diff --git a/configure.in b/configure.in index 91e53659b..fa3b2c84d 100644 --- 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 2a8ba76c4..3b8514562 100644 --- 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 f72d2127d..7639867e1 100644 --- 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 a03c440ca..061da441b 100644 --- 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 3fbe5f984..1ba385f3e 100644 --- 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 51adcf4f5..087ff5c32 100644 --- 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 6c09f6012..f09230ec4 100644 --- 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 ade582cfe..06bebcd55 100644 --- 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 ed16ba87d..d28158875 100644 --- 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 0073ead9b..4485b3e46 100644 --- 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 2899fd288..af3486414 100644 --- 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 fe4388d30..baa8cb4af 100755 --- 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 223fbe2cc..b4cb78fc0 100755 --- 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;