projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't use deprecated headers.
[pulseview.git]
/
pv
/
prop
/
bool.cpp
diff --git
a/pv/prop/bool.cpp
b/pv/prop/bool.cpp
index 699656f75d3ab60adbd81006d0c4c692886161db..9df12a0ff48208f734c78d38314d3a5bcc28acd9 100644
(file)
--- a/
pv/prop/bool.cpp
+++ b/
pv/prop/bool.cpp
@@
-14,52
+14,47
@@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* 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 <QCheckBox>
-#include "bool.h"
+#include "bool.h
pp
"
namespace pv {
namespace prop {
Bool::Bool(QString name, Getter getter, Setter setter) :
Property(name, getter, setter),
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)
{
{
}
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())
if (!variant.gobj())
- return
NULL
;
+ return
nullptr
;
bool value = Glib::VariantBase::cast_dynamic<Glib::Variant<bool>>(
variant).get();
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);
+
check_box_
= new QCheckBox(name(), parent);
+
check_box_
->setCheckState(value ? Qt::Checked : Qt::Unchecked);
if (auto_commit)
if (auto_commit)
- connect(
_check_box
, SIGNAL(stateChanged(int)),
+ connect(
check_box_
, SIGNAL(stateChanged(int)),
this, SLOT(on_state_changed(int)));
this, SLOT(on_state_changed(int)));
- return
_check_box
;
+ return
check_box_
;
}
bool Bool::labeled_widget() const
}
bool Bool::labeled_widget() const
@@
-69,13
+64,13
@@
bool Bool::labeled_widget() const
void Bool::commit()
{
void Bool::commit()
{
- assert(
_setter
);
+ assert(
setter_
);
- if (!
_check_box
)
+ if (!
check_box_
)
return;
return;
-
_setter
(Glib::Variant<bool>::create(
-
_check_box
->checkState() == Qt::Checked));
+
setter_
(Glib::Variant<bool>::create(
+
check_box_
->checkState() == Qt::Checked));
}
void Bool::on_state_changed(int)
}
void Bool::on_state_changed(int)