From: Soeren Apel Date: Sat, 18 Dec 2021 17:37:00 +0000 (+0100) Subject: GlobalSettings: Use gsize instead of guint X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=4aaa5b800184118b9db5f071c1e83ecc90e8a338;p=pulseview.git GlobalSettings: Use gsize instead of guint --- diff --git a/pv/globalsettings.cpp b/pv/globalsettings.cpp index b59f6721..38017f3b 100644 --- a/pv/globalsettings.cpp +++ b/pv/globalsettings.cpp @@ -343,7 +343,7 @@ GVariant* GlobalSettings::restore_gvariant(QSettings &settings) QByteArray data = settings.value("value").toByteArray(); #if GLIB_CHECK_VERSION(2, 67, 3) // See https://discourse.gnome.org/t/port-your-module-from-g-memdup-to-g-memdup2-now/5538 - gpointer var_data = g_memdup2((gconstpointer)data.constData(), (guint)data.size()); + gpointer var_data = g_memdup2((gconstpointer)data.constData(), (gsize)data.size()); #else gpointer var_data = g_memdup((gconstpointer)data.constData(), (guint)data.size()); #endif @@ -372,7 +372,7 @@ Glib::VariantBase GlobalSettings::restore_variantbase(QSettings &settings) QByteArray data = settings.value("value").toByteArray(); #if GLIB_CHECK_VERSION(2, 67, 3) // See https://discourse.gnome.org/t/port-your-module-from-g-memdup-to-g-memdup2-now/5538 - gpointer var_data = g_memdup2((gconstpointer)data.constData(), (guint)data.size()); + gpointer var_data = g_memdup2((gconstpointer)data.constData(), (gsize)data.size()); #else gpointer var_data = g_memdup((gconstpointer)data.constData(), (guint)data.size()); #endif