X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fprop%2Fbool.cpp;h=3e201cc4c6a1ffc8bdec2b940a8686fef9dc5e94;hp=699656f75d3ab60adbd81006d0c4c692886161db;hb=8ada6ef1319fa11fd594a34853967c1f9688913b;hpb=e8d009288de28cb194bc7964f96677c2baf900c9 diff --git a/pv/prop/bool.cpp b/pv/prop/bool.cpp index 699656f7..3e201cc4 100644 --- a/pv/prop/bool.cpp +++ b/pv/prop/bool.cpp @@ -22,14 +22,14 @@ #include -#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,27 +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_; - if (!_getter) - return NULL; + if (!getter_) + return nullptr; - Glib::VariantBase variant = _getter(); + Glib::VariantBase variant = getter_(); if (!variant.gobj()) - return NULL; + return nullptr; bool value = Glib::VariantBase::cast_dynamic>( variant).get(); - _check_box = new QCheckBox(name(), parent); - _check_box->setCheckState(value ? Qt::Checked : Qt::Unchecked); + 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 @@ -69,13 +69,13 @@ bool Bool::labeled_widget() const void Bool::commit() { - assert(_setter); + assert(setter_); - if (!_check_box) + if (!check_box_) return; - _setter(Glib::Variant::create( - _check_box->checkState() == Qt::Checked)); + setter_(Glib::Variant::create( + check_box_->checkState() == Qt::Checked)); } void Bool::on_state_changed(int)