projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MainWindow, View::View: Fix two memory errors reported by valgrind
[pulseview.git]
/
pv
/
prop
/
enum.cpp
diff --git
a/pv/prop/enum.cpp
b/pv/prop/enum.cpp
index 03524344048d5ca27e4a06b3a7f72f3f17e18fd6..71ed19e6e2c12de2ff5cc4900417e8a46cd0357d 100644
(file)
--- a/
pv/prop/enum.cpp
+++ b/
pv/prop/enum.cpp
@@
-22,7
+22,7
@@
#include <QComboBox>
#include <QComboBox>
-#include "enum.h"
+#include "enum.h
pp
"
using std::pair;
using std::vector;
using std::pair;
using std::vector;
@@
-34,54
+34,50
@@
Enum::Enum(QString name,
vector<pair<Glib::VariantBase, QString> > values,
Getter getter, Setter setter) :
Property(name, getter, setter),
vector<pair<Glib::VariantBase, QString> > values,
Getter getter, Setter setter) :
Property(name, getter, setter),
- _values(values),
- _selector(NULL)
-{
-}
-
-Enum::~Enum()
+ values_(values),
+ selector_(nullptr)
{
}
QWidget* Enum::get_widget(QWidget *parent, bool auto_commit)
{
{
}
QWidget* Enum::get_widget(QWidget *parent, bool auto_commit)
{
- if (
_selector
)
- return
_selector
;
+ if (
selector_
)
+ return
selector_
;
- 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
;
-
_selector
= new QComboBox(parent);
- for (unsigned int i = 0; i <
_values
.size(); i++) {
- const pair<Glib::VariantBase, QString> &v =
_values
[i];
-
_selector
->addItem(v.second, qVariantFromValue(v.first));
+
selector_
= new QComboBox(parent);
+ for (unsigned int i = 0; i <
values_
.size(); i++) {
+ const pair<Glib::VariantBase, QString> &v =
values_
[i];
+
selector_
->addItem(v.second, qVariantFromValue(v.first));
if (v.first.equal(variant))
if (v.first.equal(variant))
-
_selector
->setCurrentIndex(i);
+
selector_
->setCurrentIndex(i);
}
if (auto_commit)
}
if (auto_commit)
- connect(
_selector
, SIGNAL(currentIndexChanged(int)),
+ connect(
selector_
, SIGNAL(currentIndexChanged(int)),
this, SLOT(on_current_item_changed(int)));
this, SLOT(on_current_item_changed(int)));
- return
_selector
;
+ return
selector_
;
}
void Enum::commit()
{
}
void Enum::commit()
{
- assert(
_setter
);
+ assert(
setter_
);
- if (!
_selector
)
+ if (!
selector_
)
return;
return;
- const int index =
_selector
->currentIndex();
+ const int index =
selector_
->currentIndex();
if (index < 0)
return;
if (index < 0)
return;
-
_setter(_selector
->itemData(index).value<Glib::VariantBase>());
+
setter_(selector_
->itemData(index).value<Glib::VariantBase>());
}
void Enum::on_current_item_changed(int)
}
void Enum::on_current_item_changed(int)