Replace deprecated qVariantFromValue

[pulseview.git] / pv / views / trace / decodetrace.cpp

diff --git a/pv/views/trace/decodetrace.cpp b/pv/views/trace/decodetrace.cpp
index 53998b2ea7a0dc30f0728fdc9d895dd557425127..0b09439bb8bb4e28976b30102995aa5e60607d8d 100644 (file)
--- a/pv/views/trace/decodetrace.cpp
+++ b/pv/views/trace/decodetrace.cpp
@@ -971,7 +971,7 @@ pair<double, double> DecodeTrace::get_pixels_offset_samples_per_pixel() const
        const double pixels_offset =
                ((view->offset() - decode_signal_->start_time()) / scale).convert_to<double>();
 
-       double samplerate = decode_signal_->samplerate();
+       double samplerate = decode_signal_->get_samplerate();
 
        // Show sample rate as 1Hz when it is unknown
        if (samplerate == 0.0)
@@ -1142,7 +1142,7 @@ QComboBox* DecodeTrace::create_channel_selector(QWidget *parent, const DecodeCha
 
        QComboBox *selector = new QComboBox(parent);
 
-       selector->addItem("-", qVariantFromValue((void*)nullptr));
+       selector->addItem("-", QVariant::fromValue((void*)nullptr));
 
        if (!ch->assigned_signal)
                selector->setCurrentIndex(0);
@@ -1151,7 +1151,7 @@ QComboBox* DecodeTrace::create_channel_selector(QWidget *parent, const DecodeCha
                assert(b);
                if (b->logic_data() && b->enabled()) {
                        selector->addItem(b->name(),
-                               qVariantFromValue((void*)b.get()));
+                               QVariant::fromValue((void*)b.get()));
 
                        if (ch->assigned_signal == b.get())
                                selector->setCurrentIndex(selector->count() - 1);
@@ -1166,9 +1166,9 @@ QComboBox* DecodeTrace::create_channel_selector_init_state(QWidget *parent,
 {
        QComboBox *selector = new QComboBox(parent);
 
-       selector->addItem("0", qVariantFromValue((int)SRD_INITIAL_PIN_LOW));
-       selector->addItem("1", qVariantFromValue((int)SRD_INITIAL_PIN_HIGH));
-       selector->addItem("X", qVariantFromValue((int)SRD_INITIAL_PIN_SAME_AS_SAMPLE0));
+       selector->addItem("0", QVariant::fromValue((int)SRD_INITIAL_PIN_LOW));
+       selector->addItem("1", QVariant::fromValue((int)SRD_INITIAL_PIN_HIGH));
+       selector->addItem("X", QVariant::fromValue((int)SRD_INITIAL_PIN_SAME_AS_SAMPLE0));
 
        selector->setCurrentIndex(ch->initial_pin_state);
 
@@ -1340,7 +1340,7 @@ void DecodeTrace::initialize_row_widgets(DecodeTraceRow* r, unsigned int row_id)
        for (const AnnotationClass* ann_class : ann_classes) {
                cb = new QCheckBox();
                cb->setText(tr(ann_class->description));
-               cb->setChecked(ann_class->visible);
+               cb->setChecked(ann_class->visible());
 
                int dim = ViewItemPaintParams::text_height() - 2;
                QPixmap pixmap(dim, dim);
@@ -1621,7 +1621,7 @@ void DecodeTrace::on_show_hide_class(QWidget* sender)
        assert(ann_class_ptr);
        AnnotationClass* ann_class = (AnnotationClass*)ann_class_ptr;
 
-       ann_class->visible = !ann_class->visible;
+       ann_class->set_visible(!ann_class->visible());
 
        void* row_ptr = sender->property("decode_trace_row_ptr").value<void*>();
        assert(row_ptr);