X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fprop%2Fint.cpp;h=812b751608f3c561dd4ad8d45af4dc1e79008869;hb=806d3e1eb3d60e93ff95d23e79588a0486730967;hp=ef962e5a7ca5ae09ef9846261ca0fce46fb885b1;hpb=8dbbc7f0b9ea59d0f0d62225772f8a56eee125f5;p=pulseview.git

diff --git a/pv/prop/int.cpp b/pv/prop/int.cpp
index ef962e5a..812b7516 100644
--- a/pv/prop/int.cpp
+++ b/pv/prop/int.cpp
@@ -23,7 +23,7 @@
 
 #include <QSpinBox>
 
-#include "int.h"
+#include "int.hpp"
 
 using boost::optional;
 using std::max;
@@ -41,7 +41,7 @@ Int::Int(QString name,
 	Property(name, getter, setter),
 	suffix_(suffix),
 	range_(range),
-	spin_box_(NULL)
+	spin_box_(nullptr)
 {
 }
 
@@ -51,19 +51,20 @@ Int::~Int()
 
 QWidget* Int::get_widget(QWidget *parent, bool auto_commit)
 {
-	int64_t int_val = 0, range_min = 0, range_max = 0;
+	int64_t int_val = 0, range_min = 0;
+	uint64_t range_max = 0;
 
 	if (spin_box_)
 		return spin_box_;
 
 	if (!getter_)
-		return NULL;
+		return nullptr;
 
 	value_ = getter_();
 
 	GVariant *value = value_.gobj();
 	if (!value)
-		return NULL;
+		return nullptr;
 
 	spin_box_ = new QSpinBox(parent);
 	spin_box_->setSuffix(suffix_);
@@ -118,7 +119,7 @@ QWidget* Int::get_widget(QWidget *parent, bool auto_commit)
 	// custom widget.
 
 	range_min = max(range_min, (int64_t)INT_MIN);
-	range_max = min(range_max, (int64_t)INT_MAX);
+	range_max = min(range_max, (uint64_t)INT_MAX);
 
 	if (range_)
 		spin_box_->setRange((int)range_->first, (int)range_->second);
@@ -141,7 +142,7 @@ void Int::commit()
 	if (!spin_box_)
 		return;
 
-	GVariant *new_value = NULL;
+	GVariant *new_value = nullptr;
 	const GVariantType *const type = g_variant_get_type(value_.gobj());
 	assert(type);
 
@@ -154,7 +155,7 @@ void Int::commit()
 	else if (g_variant_type_equal(type, G_VARIANT_TYPE_INT32))
 		new_value = g_variant_new_int32(spin_box_->value());
 	else if (g_variant_type_equal(type, G_VARIANT_TYPE_UINT32))
-		new_value = g_variant_new_int32(spin_box_->value());
+		new_value = g_variant_new_uint32(spin_box_->value());
 	else if (g_variant_type_equal(type, G_VARIANT_TYPE_INT64))
 		new_value = g_variant_new_int64(spin_box_->value());
 	else if (g_variant_type_equal(type, G_VARIANT_TYPE_UINT64))