X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fprop%2Fbinding%2Fbinding.cpp;h=1a5eb5ec097a32994d04e3057db5090bd41aee77;hp=28a47099144eb8d50883a8d602c2f2d210a56c78;hb=d9aecf1fcd9af471db3b59de7efc65b9632a6d79;hpb=4206fe26e6b3f6439e382a072f5ff67c009f412a

diff --git a/pv/prop/binding/binding.cpp b/pv/prop/binding/binding.cpp
index 28a4709..1a5eb5e 100644
--- a/pv/prop/binding/binding.cpp
+++ b/pv/prop/binding/binding.cpp
@@ -18,15 +18,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <boost/foreach.hpp>
-
 #include <QFormLayout>
 
 #include <pv/prop/property.h>
 
 #include "binding.h"
 
-using namespace boost;
+using boost::shared_ptr;
 
 namespace pv {
 namespace prop {
@@ -39,33 +37,56 @@ const std::vector< boost::shared_ptr<Property> >& Binding::properties()
 
 void Binding::commit()
 {
-	BOOST_FOREACH(shared_ptr<pv::prop::Property> p, _properties) {
+	for (shared_ptr<pv::prop::Property> p : _properties) {
 		assert(p);
 		p->commit();
 	}
 }
 
-void Binding::add_properties_to_form(QFormLayout *layout) const
+void Binding::add_properties_to_form(QFormLayout *layout,
+	bool auto_commit) const
 {
 	assert(layout);
 
-	BOOST_FOREACH(shared_ptr<pv::prop::Property> p, _properties)
+	for (shared_ptr<pv::prop::Property> p : _properties)
 	{
 		assert(p);
-		const QString label = p->labeled_widget() ? QString() : p->name();
-		layout->addRow(label, p->get_widget(layout->parentWidget()));
+
+		QWidget *const widget = p->get_widget(layout->parentWidget(),
+			auto_commit);
+		if (p->labeled_widget())
+			layout->addRow(widget);
+		else
+			layout->addRow(p->name(), widget);
 	}
 }
 
-QWidget* Binding::get_property_form(QWidget *parent) const
+QWidget* Binding::get_property_form(QWidget *parent,
+	bool auto_commit) const
 {
 	QWidget *const form = new QWidget(parent);
 	QFormLayout *const layout = new QFormLayout(form);
 	form->setLayout(layout);
-	add_properties_to_form(layout);
+	add_properties_to_form(layout, auto_commit);
 	return form;
 }
 
+QString Binding::print_gvariant(GVariant *const gvar)
+{
+	QString s;
+
+	if (g_variant_is_of_type(gvar, G_VARIANT_TYPE("s")))
+		s = QString::fromUtf8(g_variant_get_string(gvar, NULL));
+	else
+	{
+		gchar *const text = g_variant_print(gvar, FALSE);
+		s = QString::fromUtf8(text);
+		g_free(text);
+	}
+
+	return s;
+}
+
 } // binding
 } // prop
 } // pv