X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fglobalsettings.cpp;h=38017f3b14569444c8f1ab45b5d32624bac67e69;hb=c303f96d9125f36715340a1ce31643dde86d263a;hp=b59f6721acb313b3ee6a7ed281592f316fa265d1;hpb=cf0109112932ac762f0fcfb254036fcfcec2f5b2;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