Replaced BOOST_FOREACH with C++11 range-based for loops

[pulseview.git] / pv / prop / binding / binding.cpp

diff --git a/pv/prop/binding/binding.cpp b/pv/prop/binding/binding.cpp
index 90e5214e86c08dad3eb208c5b3ccf873e609662a..1a5eb5ec097a32994d04e3057db5090bd41aee77 100644 (file)
--- a/pv/prop/binding/binding.cpp
+++ b/pv/prop/binding/binding.cpp
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <boost/foreach.hpp>
-
 #include <QFormLayout>
 
 #include <pv/prop/property.h>
@@ -39,7 +37,7 @@ 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();
        }
@@ -50,12 +48,16 @@ void Binding::add_properties_to_form(QFormLayout *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(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);
        }
 }
 
@@ -69,6 +71,22 @@ QWidget* Binding::get_property_form(QWidget *parent,
        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