X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fprop%2Fbool.cpp;h=9df12a0ff48208f734c78d38314d3a5bcc28acd9;hp=e0e052fc6b2b377c3d580192beda10793d331884;hb=eb8269e3b5eebdd77e6a82d42bcfdfbc3f7613a9;hpb=33666ec04c2a8bdeecd39eebfcf853a3628d6501

diff --git a/pv/prop/bool.cpp b/pv/prop/bool.cpp
index e0e052fc..9df12a0f 100644
--- a/pv/prop/bool.cpp
+++ b/pv/prop/bool.cpp
@@ -14,48 +14,47 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <assert.h>
+#include <cassert>
 
 #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)
-{
-}
-
-Bool::~Bool()
+	check_box_(nullptr)
 {
 }
 
 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;
 
-	GVariant *const value = _getter ? _getter() : NULL;
-	if (!value)
-		return NULL;
+	bool value = Glib::VariantBase::cast_dynamic<Glib::Variant<bool>>(
+		variant).get();
 
-	_check_box = new QCheckBox(name(), parent);
-	_check_box->setCheckState(g_variant_get_boolean(value) ?
-		Qt::Checked : Qt::Unchecked);
-	g_variant_unref(value);
+	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
@@ -65,13 +64,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)