X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fglobalsettings.cpp;h=38017f3b14569444c8f1ab45b5d32624bac67e69;hb=4aaa5b800184118b9db5f071c1e83ecc90e8a338;hp=b59f6721acb313b3ee6a7ed281592f316fa265d1;hpb=978dbc9a3e3c4bf8b42f00a269d04d0dca62b1a5;p=pulseview.git 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