diff options
| author | Aleksander Morgado <aleksander@lanedo.com> | 2012-11-02 13:13:47 +0100 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@lanedo.com> | 2012-11-02 13:13:47 +0100 |
| commit | d07c5e14b97610a14c7bf4fb20f8ac280fff8f0e (patch) | |
| tree | d904438cf64266e64411b9063addda2565021f0e /build-aux/templates | |
| parent | 94addc296e434f4c4352fa33f8b921a5c9b91494 (diff) | |
| download | external_libqmi-d07c5e14b97610a14c7bf4fb20f8ac280fff8f0e.zip external_libqmi-d07c5e14b97610a14c7bf4fb20f8ac280fff8f0e.tar.gz external_libqmi-d07c5e14b97610a14c7bf4fb20f8ac280fff8f0e.tar.bz2 | |
qmi-codegen: translate the values of enums/flags in traces
Diffstat (limited to 'build-aux/templates')
| -rw-r--r-- | build-aux/templates/qmi-enum-types-template.c | 11 | ||||
| -rw-r--r-- | build-aux/templates/qmi-enum-types-template.h | 8 | ||||
| -rw-r--r-- | build-aux/templates/qmi-flags64-types-template.h | 6 |
3 files changed, 13 insertions, 12 deletions
diff --git a/build-aux/templates/qmi-enum-types-template.c b/build-aux/templates/qmi-enum-types-template.c index db29eec..635147f 100644 --- a/build-aux/templates/qmi-enum-types-template.c +++ b/build-aux/templates/qmi-enum-types-template.c @@ -17,9 +17,6 @@ static const G@Type@Value @enum_name@_values[] = { }; /* Define type-specific symbols */ -#undef __QMI_IS_ENUM__ -#undef __QMI_IS_FLAGS__ -#define __QMI_IS_@TYPE@__ GType @enum_name@_get_type (void) @@ -39,7 +36,7 @@ GType /* Enum-specific method to get the value as a string. * We get the nick of the GEnumValue. Note that this will be * valid even if the GEnumClass is not referenced anywhere. */ -#if defined __QMI_IS_ENUM__ +#if defined __@ENUMNAME@_IS_ENUM__ /** * @enum_name@_get_string: * @val: a @EnumName@. @@ -60,13 +57,13 @@ const gchar * return NULL; } -#endif /* __QMI_IS_ENUM__ */ +#endif /* __@ENUMNAME@_IS_ENUM__ */ /* Flags-specific method to build a string with the given mask. * We get a comma separated list of the nicks of the GFlagsValues. * Note that this will be valid even if the GFlagsClass is not referenced * anywhere. */ -#if defined __QMI_IS_FLAGS__ +#if defined __@ENUMNAME@_IS_FLAGS__ /** * @enum_name@_build_string_from_mask: * @mask: bitmask of @EnumName@ values. @@ -113,7 +110,7 @@ gchar * return (str ? g_string_free (str, FALSE) : NULL); } -#endif /* __QMI_IS_FLAGS__ */ +#endif /* __@ENUMNAME@_IS_FLAGS__ */ /*** END value-tail ***/ diff --git a/build-aux/templates/qmi-enum-types-template.h b/build-aux/templates/qmi-enum-types-template.h index bdcd4e7..31e0732 100644 --- a/build-aux/templates/qmi-enum-types-template.h +++ b/build-aux/templates/qmi-enum-types-template.h @@ -15,15 +15,13 @@ GType @enum_name@_get_type (void) G_GNUC_CONST; #define @ENUMPREFIX@_TYPE_@ENUMSHORT@ (@enum_name@_get_type ()) /* Define type-specific symbols */ -#undef __QMI_IS_ENUM__ -#undef __QMI_IS_FLAGS_ -#define __QMI_IS_@TYPE@__ +#define __@ENUMNAME@_IS_@TYPE@__ -#if defined __QMI_IS_ENUM__ +#if defined __@ENUMNAME@_IS_ENUM__ const gchar *@enum_name@_get_string (@EnumName@ val); #endif -#if defined __QMI_IS_FLAGS__ +#if defined __@ENUMNAME@_IS_FLAGS__ gchar *@enum_name@_build_string_from_mask (@EnumName@ mask); #endif diff --git a/build-aux/templates/qmi-flags64-types-template.h b/build-aux/templates/qmi-flags64-types-template.h index 20d44a7..981d0e1 100644 --- a/build-aux/templates/qmi-flags64-types-template.h +++ b/build-aux/templates/qmi-flags64-types-template.h @@ -12,6 +12,12 @@ G_BEGIN_DECLS /*** BEGIN value-header ***/ +#define __@ENUMNAME@_IS_@TYPE@__ + +#if defined __@ENUMNAME@_IS_ENUM__ +#error Only flags expected, @EnumName@ is an enumeration +#endif + gchar *@enum_name@_build_string_from_mask (@EnumName@ mask); /*** END value-header ***/ |