X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fprop%2Fbinding%2Fbinding.cpp;h=062ce6676a34fbb2d6b218b9c358ba9e061f10af;hp=6432d2935f71deb62120ed75babbfab1507a63ca;hb=c1035a1452fa2aec5414975e83e531c10504b80c;hpb=f9abf97e78bc4825d80926b0ebc6cbaef40768b1

diff --git a/pv/prop/binding/binding.cpp b/pv/prop/binding/binding.cpp
index 6432d29..062ce66 100644
--- a/pv/prop/binding/binding.cpp
+++ b/pv/prop/binding/binding.cpp
@@ -22,9 +22,9 @@
 
 #include <QFormLayout>
 
-#include <pv/prop/property.h>
+#include <pv/prop/property.hpp>
 
-#include "binding.h"
+#include "binding.hpp"
 
 using std::shared_ptr;
 
@@ -34,12 +34,12 @@ namespace binding {
 
 const std::vector< std::shared_ptr<Property> >& Binding::properties()
 {
-	return _properties;
+	return properties_;
 }
 
 void Binding::commit()
 {
-	for (shared_ptr<pv::prop::Property> p : _properties) {
+	for (shared_ptr<pv::prop::Property> p : properties_) {
 		assert(p);
 		p->commit();
 	}
@@ -50,7 +50,7 @@ void Binding::add_properties_to_form(QFormLayout *layout,
 {
 	assert(layout);
 
-	for (shared_ptr<pv::prop::Property> p : _properties)
+	for (shared_ptr<pv::prop::Property> p : properties_)
 	{
 		assert(p);
 
@@ -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<Glib::Variant<std::string>>(
+				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;
 }