Suppress warnings from glibmm about deprecated auto_ptr

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

diff --git a/pv/prop/bool.cpp b/pv/prop/bool.cpp
index ac142fd440403c6b015c441f6e6b1d13ae3923aa..3e201cc4c6a1ffc8bdec2b940a8686fef9dc5e94 100644 (file)
--- a/pv/prop/bool.cpp
+++ b/pv/prop/bool.cpp
@@ -22,14 +22,14 @@
 
 #include <QCheckBox>
 
-#include "bool.h"
+#include "bool.hpp"
 
 namespace pv {
 namespace prop {
 
 Bool::Bool(QString name, Getter getter, Setter setter) :
        Property(name, getter, setter),
-       _check_box(NULL)
+       check_box_(nullptr)
 {
 }
 
@@ -39,24 +39,27 @@ Bool::~Bool()
 
 QWidget* Bool::get_widget(QWidget *parent, bool auto_commit)
 {
-       if (_check_box)
-               return _check_box;
+       if (check_box_)
+               return check_box_;
 
-       _check_box = new QCheckBox(name(), parent);
+       if (!getter_)
+               return nullptr;
 
-       GVariant *const value = _getter ? _getter() : NULL;
+       Glib::VariantBase variant = getter_();
+       if (!variant.gobj())
+               return nullptr;
 
-       if (value) {
-               _check_box->setCheckState(g_variant_get_boolean(value) ?
-                       Qt::Checked : Qt::Unchecked);
-               g_variant_unref(value);
-       }
+       bool value = Glib::VariantBase::cast_dynamic<Glib::Variant<bool>>(
+               variant).get();
+
+       check_box_ = new QCheckBox(name(), parent);
+       check_box_->setCheckState(value ? Qt::Checked : Qt::Unchecked);
 
        if (auto_commit)
-               connect(_check_box, SIGNAL(stateChanged(int)),
+               connect(check_box_, SIGNAL(stateChanged(int)),
                        this, SLOT(on_state_changed(int)));
 
-       return _check_box;
+       return check_box_;
 }
 
 bool Bool::labeled_widget() const
@@ -66,13 +69,13 @@ bool Bool::labeled_widget() const
 
 void Bool::commit()
 {
-       assert(_setter);
+       assert(setter_);
 
-       if (!_check_box)
+       if (!check_box_)
                return;
 
-       _setter(g_variant_new_boolean(
-               _check_box->checkState() == Qt::Checked));
+       setter_(Glib::Variant<bool>::create(
+               check_box_->checkState() == Qt::Checked));
 }
 
 void Bool::on_state_changed(int)