From 273c4a616b6dc79e07573555251c7f8ae4cc17d4 Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Sat, 13 May 2017 11:41:09 +0200 Subject: [PATCH] Migration to GValue for element value. --- configure.ac | 4 ++-- src/form.c | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/configure.ac b/configure.ac index 9ff3bc7..d48c852 100644 --- a/configure.ac +++ b/configure.ac @@ -40,8 +40,8 @@ AM_GLIB_GNU_GETTEXT # Checks for libraries. PKG_CHECK_MODULES(ZAKFORMGDAEX, [libzakform - libgdaex - libzakutils]) + libgdaex + libzakutils]) AC_SUBST(ZAKFORMGDAEX_CFLAGS) AC_SUBST(ZAKFORMGDAEX_LIBS) diff --git a/src/form.c b/src/form.c index 7b35bbd..41df4c5 100644 --- a/src/form.c +++ b/src/form.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Andrea Zagli + * Copyright (C) 2015-2017 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -283,11 +283,11 @@ static GValue { GValue *ret; - gchar *value; + GValue *value; gchar *type; GHashTable *format; - value = zak_form_element_get_value (element); + value = zak_form_element_get_value_gvalue (element); type = zak_form_element_get_provider_type (element); format = zak_form_element_get_format (element); @@ -298,7 +298,7 @@ static GValue thousands_saparator = (gchar *)g_hash_table_lookup (format, "thousands_separator"); - unformatted = zak_utils_unformat_money_full (value, thousands_saparator, NULL); + unformatted = zak_utils_unformat_money_full (g_value_get_string (value), thousands_saparator, NULL); if (for_where && unformatted == 0.0) { @@ -318,7 +318,7 @@ static GValue thousands_saparator = (gchar *)g_hash_table_lookup (format, "thousands_separator"); currency_symbol = (gchar *)g_hash_table_lookup (format, "currency_symbol"); - unformatted = zak_utils_unformat_money_full (value, thousands_saparator, currency_symbol); + unformatted = zak_utils_unformat_money_full (g_value_get_string (value), thousands_saparator, currency_symbol); if (for_where && unformatted == 0.0) { @@ -331,18 +331,18 @@ static GValue } else if (g_ascii_strcasecmp (type, "string") == 0) { - if (for_where && g_strcmp0 (g_strstrip (g_strdup (value)), "") == 0) + if (for_where && g_strcmp0 (g_strstrip (g_strdup (g_value_get_string (value))), "") == 0) { ret = gda_value_new_null (); } else { - ret = zak_utils_gvalue_new_string (value); + ret = zak_utils_gvalue_new_string (g_value_get_string (value)); } } else if (g_ascii_strcasecmp (type, "boolean") == 0) { - ret = zak_utils_gvalue_new_boolean (zak_utils_string_to_boolean (value)); + ret = zak_utils_gvalue_new_boolean (zak_utils_string_to_boolean (g_value_get_string (value))); } else if (g_ascii_strcasecmp (type, "date") == 0) { @@ -351,7 +351,7 @@ static GValue gchar *datetime_format; datetime_format = (gchar *)g_hash_table_lookup (format, "content"); - gdt = zak_utils_get_gdatetime_from_string (value, datetime_format); + gdt = zak_utils_get_gdatetime_from_string (g_value_get_string (value), datetime_format); if (gdt == NULL) { @@ -374,7 +374,7 @@ static GValue gchar *datetime_format; datetime_format = (gchar *)g_hash_table_lookup (format, "content"); - gdt = zak_utils_get_gdatetime_from_string (value, datetime_format); + gdt = zak_utils_get_gdatetime_from_string (g_value_get_string (value), datetime_format); if (gdt == NULL) { @@ -397,7 +397,7 @@ static GValue gchar *datetime_format; datetime_format = (gchar *)g_hash_table_lookup (format, "content"); - gdt = zak_utils_get_gdatetime_from_string (value, datetime_format); + gdt = zak_utils_get_gdatetime_from_string (g_value_get_string (value), datetime_format); if (gdt == NULL) { -- 2.49.0