From 76cc2d96a5601572639032d33c2e1a16ff8a8905 Mon Sep 17 00:00:00 2001 From: Alexander Akulich Date: Thu, 12 Dec 2019 23:35:26 +0300 Subject: Tests: Adjust expected gtypes sources to conform with the types order --- tests/tools/expected-gtypes-body.h | 24 ++++++++++++------------ tests/tools/expected-gtypes.h | 8 ++++---- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/tests/tools/expected-gtypes-body.h b/tests/tools/expected-gtypes-body.h index ab1d7e99a..be1db8a06 100644 --- a/tests/tools/expected-gtypes-body.h +++ b/tests/tools/expected-gtypes-body.h @@ -5,32 +5,32 @@ */ GType -the_prefix_type_dbus_hash_ss (void) +the_prefix_type_dbus_hash_sv (void) { static GType t = 0; if (G_UNLIKELY (t == 0)) - t = dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_STRING); + t = dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE); return t; } GType -the_prefix_type_dbus_hash_sa_7bsv_7d (void) +the_prefix_type_dbus_hash_ss (void) { static GType t = 0; if (G_UNLIKELY (t == 0)) - t = dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, (dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE))); + t = dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_STRING); return t; } GType -the_prefix_type_dbus_hash_sv (void) +the_prefix_type_dbus_hash_sa_7bsv_7d (void) { static GType t = 0; if (G_UNLIKELY (t == 0)) - t = dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE); + t = dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, (dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE))); return t; } @@ -69,32 +69,32 @@ the_prefix_type_dbus_array_isu (void) } GType -the_prefix_type_dbus_array_of_a_7bsa_7bsv_7d_7d (void) +the_prefix_type_dbus_array_of_a_7bsaa_7bsv_7d_7d (void) { static GType t = 0; if (G_UNLIKELY (t == 0)) - t = dbus_g_type_get_collection ("GPtrArray", the_prefix_type_dbus_hash_sa_7bsv_7d ()); + t = dbus_g_type_get_collection ("GPtrArray", the_prefix_type_dbus_hash_saa_7bsv_7d ()); return t; } GType -the_prefix_type_dbus_array_of_a_7bsv_7d (void) +the_prefix_type_dbus_array_of_a_7bsa_7bsv_7d_7d (void) { static GType t = 0; if (G_UNLIKELY (t == 0)) - t = dbus_g_type_get_collection ("GPtrArray", the_prefix_type_dbus_hash_sv ()); + t = dbus_g_type_get_collection ("GPtrArray", the_prefix_type_dbus_hash_sa_7bsv_7d ()); return t; } GType -the_prefix_type_dbus_array_of_a_7bsaa_7bsv_7d_7d (void) +the_prefix_type_dbus_array_of_a_7bsv_7d (void) { static GType t = 0; if (G_UNLIKELY (t == 0)) - t = dbus_g_type_get_collection ("GPtrArray", the_prefix_type_dbus_hash_saa_7bsv_7d ()); + t = dbus_g_type_get_collection ("GPtrArray", the_prefix_type_dbus_hash_sv ()); return t; } diff --git a/tests/tools/expected-gtypes.h b/tests/tools/expected-gtypes.h index 2fc94e261..e18f527b4 100644 --- a/tests/tools/expected-gtypes.h +++ b/tests/tools/expected-gtypes.h @@ -18,12 +18,12 @@ #define THE_PREFIX_ARRAY_TYPE_STRING_VARIANT_MAP_LIST_MAP_LIST (the_prefix_type_dbus_array_of_a_7bsaa_7bsv_7d_7d ()) +GType the_prefix_type_dbus_hash_sv (void); + GType the_prefix_type_dbus_hash_ss (void); GType the_prefix_type_dbus_hash_sa_7bsv_7d (void); -GType the_prefix_type_dbus_hash_sv (void); - GType the_prefix_type_dbus_hash_saa_7bsv_7d (void); #define THE_PREFIX_STRUCT_TYPE_STRUCT (the_prefix_type_dbus_struct_isu ()) @@ -34,9 +34,9 @@ GType the_prefix_type_dbus_struct_isu (void); GType the_prefix_type_dbus_array_isu (void); +GType the_prefix_type_dbus_array_of_a_7bsaa_7bsv_7d_7d (void); + GType the_prefix_type_dbus_array_of_a_7bsa_7bsv_7d_7d (void); GType the_prefix_type_dbus_array_of_a_7bsv_7d (void); -GType the_prefix_type_dbus_array_of_a_7bsaa_7bsv_7d_7d (void); - -- cgit v1.2.1