X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fprop%2Fbinding%2Fbinding.cpp;h=86318139673a72bb71d6f89010361519c7284a5c;hp=6432d2935f71deb62120ed75babbfab1507a63ca;hb=e8d009288de28cb194bc7964f96677c2baf900c9;hpb=87b79835014a386fb51b52bc993dbb693bd27197 diff --git a/pv/prop/binding/binding.cpp b/pv/prop/binding/binding.cpp index 6432d29..8631813 100644 --- a/pv/prop/binding/binding.cpp +++ b/pv/prop/binding/binding.cpp @@ -73,18 +73,18 @@ QWidget* Binding::get_property_form(QWidget *parent, return form; } -QString Binding::print_gvariant(GVariant *const gvar) +QString Binding::print_gvariant(Glib::VariantBase gvar) { QString s; - if (g_variant_is_of_type(gvar, G_VARIANT_TYPE("s"))) - s = QString::fromUtf8(g_variant_get_string(gvar, NULL)); + if (!gvar.gobj()) + s = QString::fromStdString("(null)"); + else if (gvar.is_of_type(Glib::VariantType("s"))) + s = QString::fromStdString( + Glib::VariantBase::cast_dynamic>( + gvar).get()); else - { - gchar *const text = g_variant_print(gvar, FALSE); - s = QString::fromUtf8(text); - g_free(text); - } + s = QString::fromStdString(gvar.print()); return s; }