X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fprop%2Fbool.cpp;h=3e201cc4c6a1ffc8bdec2b940a8686fef9dc5e94;hp=ad9a13e7c0e05bc710fc7d385b6ad7e6b22a04be;hb=8ada6ef1319fa11fd594a34853967c1f9688913b;hpb=f459c5400e067c4389c472b84194d760e7bfd585

diff --git a/pv/prop/bool.cpp b/pv/prop/bool.cpp
index ad9a13e7..3e201cc4 100644
--- a/pv/prop/bool.cpp
+++ b/pv/prop/bool.cpp
@@ -22,17 +22,14 @@
 
 #include <QCheckBox>
 
-#include "bool.h"
-
-using namespace std;
-using namespace boost;
+#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)
 {
 }
 
@@ -40,22 +37,29 @@ Bool::~Bool()
 {
 }
 
-QWidget* Bool::get_widget(QWidget *parent)
+QWidget* Bool::get_widget(QWidget *parent, bool auto_commit)
 {
-	if (_check_box)
-		return _check_box;
+	if (check_box_)
+		return check_box_;
+
+	if (!getter_)
+		return nullptr;
+
+	Glib::VariantBase variant = getter_();
+	if (!variant.gobj())
+		return nullptr;
 
-	_check_box = new QCheckBox(name(), parent);
+	bool value = Glib::VariantBase::cast_dynamic<Glib::Variant<bool>>(
+		variant).get();
 
-	GVariant *const value = _getter ? _getter() : NULL;
+	check_box_ = new QCheckBox(name(), parent);
+	check_box_->setCheckState(value ? Qt::Checked : Qt::Unchecked);
 
-	if (value) {
-		_check_box->setCheckState(g_variant_get_boolean(value) ?
-			Qt::Checked : Qt::Unchecked);
-		g_variant_unref(value);
-	}
+	if (auto_commit)
+		connect(check_box_, SIGNAL(stateChanged(int)),
+			this, SLOT(on_state_changed(int)));
 
-	return _check_box;
+	return check_box_;
 }
 
 bool Bool::labeled_widget() const
@@ -65,13 +69,18 @@ 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)
+{
+	commit();
 }
 
 } // prop