Replaced lengthy iterator types with the auto keyword

[pulseview.git] / pv / view / logicsignal.cpp

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index 89c375cc0551cb7689e7b63a4693b70c8d962f3b..546743e337bd62caae00f836a31c09b0630f664d 100644 (file)
--- a/pv/view/logicsignal.cpp
+++ b/pv/view/logicsignal.cpp
@@ -29,7 +29,7 @@
 #include "view.h"
 
 #include <pv/sigsession.h>
-#include <pv/devinst.h>
+#include <pv/device/devinst.h>
 #include <pv/data/logic.h>
 #include <pv/data/logicsnapshot.h>
 #include <pv/view/view.h>
@@ -63,8 +63,8 @@ const QColor LogicSignal::SignalColours[10] = {
        QColor(0xEE, 0xEE, 0xEC),       // White
 };
 
-LogicSignal::LogicSignal(shared_ptr<pv::DevInst> dev_inst,
-       const sr_probe *const probe, shared_ptr<data::Logic> data) :
+LogicSignal::LogicSignal(shared_ptr<pv::device::DevInst> dev_inst,
+       const sr_channel *const probe, shared_ptr<data::Logic> data) :
        Signal(dev_inst, probe),
        _data(data),
        _trigger_none(NULL),
@@ -155,9 +155,7 @@ void LogicSignal::paint_mid(QPainter &p, int left, int right)
        QLineF *const edge_lines = new QLineF[edge_count];
        line = edge_lines;
 
-       for (vector<pv::data::LogicSnapshot::EdgePair>::const_iterator i =
-                       edges.begin() + 1;
-               i != edges.end() - 1; i++) {
+       for (auto i = edges.cbegin() + 1; i != edges.cend() - 1; i++) {
                const float x = ((*i).first / samples_per_pixel -
                        pixels_offset) + left;
                *line++ = QLineF(x, high_offset, x, low_offset);
@@ -188,8 +186,7 @@ void LogicSignal::paint_caps(QPainter &p, QLineF *const lines,
 {
        QLineF *line = lines;
 
-       for (vector<pv::data::LogicSnapshot::EdgePair>::const_iterator i =
-               edges.begin(); i != (edges.end() - 1); i++)
+       for (auto i = edges.begin(); i != (edges.end() - 1); i++)
                if ((*i).second == level) {
                        *line++ = QLineF(
                                ((*i).first / samples_per_pixel -
@@ -248,7 +245,7 @@ void LogicSignal::populate_popup_form(QWidget *parent, QFormLayout *form)
 
        // Add the trigger actions
        assert(_dev_inst);
-       if (!(gvar = _dev_inst->list_config(NULL, SR_CONF_TRIGGER_TYPE)))
+       if ((gvar = _dev_inst->list_config(NULL, SR_CONF_TRIGGER_TYPE)))
        {
                const char *const trig_types =
                        g_variant_get_string(gvar, NULL);
@@ -306,7 +303,7 @@ void LogicSignal::set_trigger(char type)
        const sr_dev_inst *const sdi = _dev_inst->dev_inst();
        assert(sdi);
 
-       const int probe_count = g_slist_length(sdi->probes);
+       const int probe_count = g_slist_length(sdi->channels);
        assert(probe_count > 0);
 
        assert(_probe && _probe->index < probe_count);