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

diff --git a/pv/prop/binding/binding.cpp b/pv/prop/binding/binding.cpp
index 3c9bba5..062ce66 100644
--- a/pv/prop/binding/binding.cpp
+++ b/pv/prop/binding/binding.cpp
@@ -18,49 +18,77 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <boost/foreach.hpp>
+#include <cassert>
 
 #include <QFormLayout>
 
-#include <pv/prop/property.h>
+#include <pv/prop/property.hpp>
 
-#include "binding.h"
+#include "binding.hpp"
 
-using namespace boost;
+using std::shared_ptr;
 
 namespace pv {
 namespace prop {
 namespace binding {
 
-const std::vector< boost::shared_ptr<Property> >& Binding::properties()
+const std::vector< std::shared_ptr<Property> >& Binding::properties()
 {
-	return _properties;
+	return 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();
 	}
 }
 
-QWidget* Binding::get_property_form(QWidget *parent) const
+void Binding::add_properties_to_form(QFormLayout *layout,
+	bool auto_commit) const
 {
-	QWidget *const form = new QWidget(parent);
-	QFormLayout *const layout = new QFormLayout(form);
-	form->setLayout(layout);
+	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(form));
+
+		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,
+	bool auto_commit) const
+{
+	QWidget *const form = new QWidget(parent);
+	QFormLayout *const layout = new QFormLayout(form);
+	form->setLayout(layout);
+	add_properties_to_form(layout, auto_commit);
 	return form;
 }
 
+QString Binding::print_gvariant(Glib::VariantBase gvar)
+{
+	QString s;
+
+	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
+		s = QString::fromStdString(gvar.print());
+
+	return s;
+}
+
 } // binding
 } // prop
 } // pv