Don't use deprecated headers.

[pulseview.git] / pv / prop / int.cpp

diff --git a/pv/prop/int.cpp b/pv/prop/int.cpp
index 55b7ab3e09fa8bd4f00cb37ff4886a5f795d7fb3..789c26eb0236c9efb89c3c2291cd92e1a5d0e421 100644 (file)
--- a/pv/prop/int.cpp
+++ b/pv/prop/int.cpp
@@ -14,12 +14,11 @@
  * 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 <stdint.h>
-#include <assert.h>
+#include <cstdint>
+#include <cassert>
 
 #include <QSpinBox>
 
@@ -41,29 +40,26 @@ Int::Int(QString name,
        Property(name, getter, setter),
        suffix_(suffix),
        range_(range),
-       spin_box_(NULL)
-{
-}
-
-Int::~Int()
+       spin_box_(nullptr)
 {
 }
 
 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_);
@@ -71,43 +67,28 @@ QWidget* Int::get_widget(QWidget *parent, bool auto_commit)
        const GVariantType *const type = g_variant_get_type(value);
        assert(type);
 
-       if (g_variant_type_equal(type, G_VARIANT_TYPE_BYTE))
-       {
+       if (g_variant_type_equal(type, G_VARIANT_TYPE_BYTE)) {
                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))
-       {
+       } else if (g_variant_type_equal(type, G_VARIANT_TYPE_INT16)) {
                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))
-       {
+       } else if (g_variant_type_equal(type, G_VARIANT_TYPE_UINT16)) {
                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))
-       {
+       } else if (g_variant_type_equal(type, G_VARIANT_TYPE_INT32)) {
                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))
-       {
+       } else if (g_variant_type_equal(type, G_VARIANT_TYPE_UINT32)) {
                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))
-       {
+       } else if (g_variant_type_equal(type, G_VARIANT_TYPE_INT64)) {
                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))
-       {
+       } else if (g_variant_type_equal(type, G_VARIANT_TYPE_UINT64)) {
                int_val = g_variant_get_uint64(value);
                range_min = 0, range_max = UINT64_MAX;
-       }
-       else
-       {
+       } else {
                // Unexpected value type.
                assert(0);
        }
@@ -118,7 +99,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 +122,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);