projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
android: Don't install unneeded Python files.
[pulseview.git]
/
pv
/
prop
/
int.cpp
diff --git
a/pv/prop/int.cpp
b/pv/prop/int.cpp
index 4277524886a0f12c9cc5ff610ed805a7faad3c92..45113ac73e6e8954aeb6b05f5b4a2ffce5ca6f23 100644
(file)
--- a/
pv/prop/int.cpp
+++ b/
pv/prop/int.cpp
@@
-41,15
+41,12
@@
Int::Int(QString name,
Property(name, getter, setter),
_suffix(suffix),
_range(range),
Property(name, getter, setter),
_suffix(suffix),
_range(range),
- _value(NULL),
_spin_box(NULL)
{
}
Int::~Int()
{
_spin_box(NULL)
{
}
Int::~Int()
{
- if (_value)
- g_variant_unref(_value);
}
QWidget* Int::get_widget(QWidget *parent, bool auto_commit)
}
QWidget* Int::get_widget(QWidget *parent, bool auto_commit)
@@
-59,53
+56,54
@@
QWidget* Int::get_widget(QWidget *parent, bool auto_commit)
if (_spin_box)
return _spin_box;
if (_spin_box)
return _spin_box;
- if (_value)
- g_variant_unref(_value);
+ if (!_getter)
+ return NULL;
+
+ _value = _getter();
- _value = _getter ? _getter() : NULL;
- assert(_value);
- if (!_value)
+ GVariant *value = _value.gobj();
+ if (!value)
return NULL;
_spin_box = new QSpinBox(parent);
_spin_box->setSuffix(_suffix);
return NULL;
_spin_box = new QSpinBox(parent);
_spin_box->setSuffix(_suffix);
- const GVariantType *const type = g_variant_get_type(
_
value);
+ const GVariantType *const type = g_variant_get_type(value);
assert(type);
if (g_variant_type_equal(type, G_VARIANT_TYPE_BYTE))
{
assert(type);
if (g_variant_type_equal(type, G_VARIANT_TYPE_BYTE))
{
- int_val = g_variant_get_byte(
_
value);
+ int_val = g_variant_get_byte(value);
range_min = 0, range_max = UINT8_MAX;
}
else if (g_variant_type_equal(type, G_VARIANT_TYPE_INT16))
{
range_min = 0, range_max = UINT8_MAX;
}
else if (g_variant_type_equal(type, G_VARIANT_TYPE_INT16))
{
- int_val = g_variant_get_int16(
_
value);
+ int_val = g_variant_get_int16(value);
range_min = INT16_MIN, range_max = INT16_MAX;
}
else if (g_variant_type_equal(type, G_VARIANT_TYPE_UINT16))
{
range_min = INT16_MIN, range_max = INT16_MAX;
}
else if (g_variant_type_equal(type, G_VARIANT_TYPE_UINT16))
{
- int_val = g_variant_get_uint16(
_
value);
+ int_val = g_variant_get_uint16(value);
range_min = 0, range_max = UINT16_MAX;
}
else if (g_variant_type_equal(type, G_VARIANT_TYPE_INT32))
{
range_min = 0, range_max = UINT16_MAX;
}
else if (g_variant_type_equal(type, G_VARIANT_TYPE_INT32))
{
- int_val = g_variant_get_int32(
_
value);
+ int_val = g_variant_get_int32(value);
range_min = INT32_MIN, range_max = INT32_MAX;
}
else if (g_variant_type_equal(type, G_VARIANT_TYPE_UINT32))
{
range_min = INT32_MIN, range_max = INT32_MAX;
}
else if (g_variant_type_equal(type, G_VARIANT_TYPE_UINT32))
{
- int_val = g_variant_get_uint32(
_
value);
+ int_val = g_variant_get_uint32(value);
range_min = 0, range_max = UINT32_MAX;
}
else if (g_variant_type_equal(type, G_VARIANT_TYPE_INT64))
{
range_min = 0, range_max = UINT32_MAX;
}
else if (g_variant_type_equal(type, G_VARIANT_TYPE_INT64))
{
- int_val = g_variant_get_int64(
_
value);
+ int_val = g_variant_get_int64(value);
range_min = INT64_MIN, range_max = INT64_MAX;
}
else if (g_variant_type_equal(type, G_VARIANT_TYPE_UINT64))
{
range_min = INT64_MIN, range_max = INT64_MAX;
}
else if (g_variant_type_equal(type, G_VARIANT_TYPE_UINT64))
{
- int_val = g_variant_get_uint64(
_
value);
+ int_val = g_variant_get_uint64(value);
range_min = 0, range_max = UINT64_MAX;
}
else
range_min = 0, range_max = UINT64_MAX;
}
else
@@
-143,10
+141,8
@@
void Int::commit()
if (!_spin_box)
return;
if (!_spin_box)
return;
- assert(_value);
-
GVariant *new_value = NULL;
GVariant *new_value = NULL;
- const GVariantType *const type = g_variant_get_type(_value);
+ const GVariantType *const type = g_variant_get_type(_value
.gobj()
);
assert(type);
if (g_variant_type_equal(type, G_VARIANT_TYPE_BYTE))
assert(type);
if (g_variant_type_equal(type, G_VARIANT_TYPE_BYTE))
@@
-171,11
+167,9
@@
void Int::commit()
assert(new_value);
assert(new_value);
- g_variant_unref(_value);
- g_variant_ref(new_value);
- _value = new_value;
+ _value = Glib::VariantBase(new_value);
- _setter(
new
_value);
+ _setter(_value);
}
void Int::on_value_changed(int)
}
void Int::on_value_changed(int)