* 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();
}
{
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(),
- auto_commit));
+
+ QWidget *const widget = p->get_widget(layout->parentWidget(),
+ auto_commit);
+ if (p->labeled_widget())
+ layout->addRow(widget);
+ else
+ layout->addRow(p->name(), widget);
}
}
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