From 55a69344a0aa514add0f824c2da13908666a32b4 Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Fri, 23 Sep 2016 11:50:38 +0200 Subject: [PATCH] Rimosse deprecazioni da libzakutils. --- configure.ac | 4 ++-- src/ooo.c | 8 +++++--- src/utils.c | 10 +++++----- tests/utils.c | 6 ++++-- tests/utils_compare_version.c | 6 ++++-- tests/utils_format_money.c | 8 +++++--- tests/utils_gdatetime.c | 8 +++++--- tests/utils_gstring_initial_capital.c | 6 ++++-- tests/utils_round.c | 6 ++++-- 9 files changed, 38 insertions(+), 24 deletions(-) diff --git a/configure.ac b/configure.ac index 60ce102..c686253 100644 --- a/configure.ac +++ b/configure.ac @@ -43,8 +43,8 @@ PKG_CHECK_MODULES(SOLIPA, [libgdaex >= 0.5.0 libgtkform >= 0.5.0 gio-2.0 >= 2.36 gtk+-3.0 >= 3.0 - libzakutils - libzakformgtk]) + libzakutils + libzakformgtk]) AC_SUBST(SOLIPA_CFLAGS) AC_SUBST(SOLIPA_LIBS) diff --git a/src/ooo.c b/src/ooo.c index f1c6d53..c4aa4c7 100644 --- a/src/ooo.c +++ b/src/ooo.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011-2015 Andrea Zagli + * Copyright (C) 2011-2016 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -24,6 +24,8 @@ #include +#include + #include "utils.h" #include "ooo.h" @@ -327,7 +329,7 @@ gchar "found.String = %s.replace(found.String, u\"%s\", u\"%s\")\n", !priv->with_search ? "search = document.createSearchDescriptor()\n" : "", _search, - priv->ooo_version == NULL || solipa_compare_version (priv->ooo_version, "3.0.0", NULL, &part) > 0 ? "str" : "unicode", + priv->ooo_version == NULL || zak_utils_compare_version (priv->ooo_version, "3.0.0", NULL, &part) > 0 ? "str" : "unicode", _search, _replace); priv->with_search = TRUE; @@ -544,7 +546,7 @@ solipa_ooo_pycmd_apri_openoffice (SolipaOOO *ooo) guint part; if (priv->ooo_version == NULL - || solipa_compare_version (priv->ooo_version, "3.0.0", NULL, &part) > 0) + || zak_utils_compare_version (priv->ooo_version, "3.0.0", NULL, &part) > 0) { dash = g_strdup ("-"); } diff --git a/src/utils.c b/src/utils.c index 9663407..05327e5 100644 --- a/src/utils.c +++ b/src/utils.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2015 Andrea Zagli + * Copyright (C) 2010-2016 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -892,7 +892,7 @@ solipa_gtk_tree_model_get_value_integer (GtkTreeModel *model, GtkTreeIter *iter, if (G_VALUE_HOLDS_STRING (gval)) { /* try conversion */ - ret = (gint)trunc ((gfloat)solipa_unformat_money (g_value_get_string (gval))); + ret = (gint)trunc ((gfloat)zak_utils_unformat_money (g_value_get_string (gval))); } else if (G_VALUE_HOLDS_INT (gval)) { @@ -921,7 +921,7 @@ solipa_gtk_tree_model_get_value_double (GtkTreeModel *model, GtkTreeIter *iter, if (G_VALUE_HOLDS_STRING (gval)) { /* try conversion */ - ret = solipa_unformat_money (g_value_get_string (gval)); + ret = zak_utils_unformat_money (g_value_get_string (gval)); } else { @@ -963,7 +963,7 @@ struct tm dt = solipa_gtk_tree_model_get_value_gdatetime (model, iter, column, format); - ret = solipa_gdatetime_to_tm (dt); + ret = zak_utils_gdatetime_to_tm (dt); return ret; } @@ -976,7 +976,7 @@ GDateTime value = solipa_gtk_tree_model_get_value_string (model, iter, column); - ret = solipa_get_gdatetime_from_string (value, format); + ret = zak_utils_get_gdatetime_from_string (value, format); return ret; } diff --git a/tests/utils.c b/tests/utils.c index 74f9056..7d741c1 100644 --- a/tests/utils.c +++ b/tests/utils.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 Andrea Zagli + * Copyright (C) 2010-2016 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include + #include #include @@ -121,7 +123,7 @@ main (int argc, char *argv[]) g_random_int_range (1, 31), g_random_int_range (1, 12), g_random_int_range (1990, 2011)), - 4, solipa_format_money ((row + 1) * g_random_double_range (1000, 100000), -1, FALSE), + 4, zak_utils_format_money ((row + 1) * g_random_double_range (1000, 100000), -1, FALSE), -1); } diff --git a/tests/utils_compare_version.c b/tests/utils_compare_version.c index be10577..020d2c3 100644 --- a/tests/utils_compare_version.c +++ b/tests/utils_compare_version.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2014 Andrea Zagli + * Copyright (C) 2014-2016 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include + #include #include @@ -27,7 +29,7 @@ main (int argc, char *argv[]) if (argc == 3) { - ret = solipa_compare_version (argv[1], argv[2], NULL, &part); + ret = zak_utils_compare_version (argv[1], argv[2], NULL, &part); g_message ("%s è %s %s (%d)", argv[1], ret == -1 ? "minore di" : ret == 0 ? "uguale a" : "maggiore di", diff --git a/tests/utils_format_money.c b/tests/utils_format_money.c index 0fea328..8b6f812 100644 --- a/tests/utils_format_money.c +++ b/tests/utils_format_money.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2011 Andrea Zagli + * Copyright (C) 2010-2016 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include + #include #include @@ -34,10 +36,10 @@ main (int argc, char *argv[]) g_message ("VALUE %s DOUBLE %s", argv[1], g_strdup_printf (g_strdup_printf ("%%.%df", n_dec), g_strtod (argv[1], NULL))); g_message ("DECIMALS %d", n_dec); - str = solipa_format_money (g_strtod (argv[1], NULL), n_dec, FALSE); + str = zak_utils_format_money (g_strtod (argv[1], NULL), n_dec, FALSE); g_message ("FORMAT %s", str); - g_message ("UNFORMAT %f", solipa_unformat_money (str)); + g_message ("UNFORMAT %f", zak_utils_unformat_money (str)); return 0; } diff --git a/tests/utils_gdatetime.c b/tests/utils_gdatetime.c index eedf156..e2b6cde 100644 --- a/tests/utils_gdatetime.c +++ b/tests/utils_gdatetime.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011-2015 Andrea Zagli + * Copyright (C) 2011-2016 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include + #include #include @@ -26,7 +28,7 @@ main (int argc, char *argv[]) if (argc == 3) { - gdatetime = solipa_get_gdatetime_from_string (argv[1], argv[2]); + gdatetime = zak_utils_get_gdatetime_from_string (argv[1], argv[2]); } else { @@ -41,7 +43,7 @@ main (int argc, char *argv[]) } g_message ("g_date_time_format %s", g_date_time_format (gdatetime, "%d/%m/%Y %H.%M.%S")); - g_message ("solipa_gdatetime_to_sql %s", solipa_gdatetime_to_sql (gdatetime, "datetime")); + g_message ("solipa_gdatetime_to_sql %s", zak_utils_gdatetime_to_sql (gdatetime, "datetime")); return 0; } diff --git a/tests/utils_gstring_initial_capital.c b/tests/utils_gstring_initial_capital.c index d53c712..d795188 100644 --- a/tests/utils_gstring_initial_capital.c +++ b/tests/utils_gstring_initial_capital.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2015 Andrea Zagli + * Copyright (C) 2012-2016 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include + #include #include @@ -27,7 +29,7 @@ main (int argc, char *argv[]) if (argc == 2) { str = g_string_new (argv[1]); - solipa_gstring_initial_capital (str); + zak_utils_gstring_initial_capital (str); g_message ("%s", str->str); g_string_free (str, TRUE); } diff --git a/tests/utils_round.c b/tests/utils_round.c index 2ca7a09..c1f16bd 100644 --- a/tests/utils_round.c +++ b/tests/utils_round.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2011 Andrea Zagli + * Copyright (C) 2010-2016 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include + #include #include @@ -24,7 +26,7 @@ main (int argc, char *argv[]) { gtk_init (&argc, &argv); - g_message ("%f", solipa_round (g_strtod (argv[1], NULL), 2)); + g_message ("%f", zak_utils_round (g_strtod (argv[1], NULL), 2)); return 0; } -- 2.49.0