From 7aa09b00585d5214cd91e77f1f1611e69f93d711 Mon Sep 17 00:00:00 2001 From: Joel Holdsworth Date: Mon, 2 Dec 2013 20:02:44 +0000 Subject: [PATCH] Renamed pv::view::LogicSignal::data to logic_data --- pv/data/decoderstack.cpp | 2 +- pv/view/decodetrace.cpp | 2 +- pv/view/logicsignal.cpp | 2 +- pv/view/logicsignal.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp index d6fa17ca..7bd5e6e6 100644 --- a/pv/data/decoderstack.cpp +++ b/pv/data/decoderstack.cpp @@ -125,7 +125,7 @@ void DecoderStack::begin_decode() BOOST_FOREACH (const shared_ptr &dec, _stack) if (dec && !dec->probes().empty() && ((logic_signal = (*dec->probes().begin()).second)) && - ((data = logic_signal->data()))) + ((data = logic_signal->logic_data()))) break; if (!data) diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp index beb83b1f..1d5a6268 100644 --- a/pv/view/decodetrace.cpp +++ b/pv/view/decodetrace.cpp @@ -250,7 +250,7 @@ void DecodeTrace::draw_unresolved_period(QPainter &p, int h, int left, BOOST_FOREACH (const shared_ptr &dec, stack) if (dec && !dec->probes().empty() && ((logic_signal = (*dec->probes().begin()).second)) && - ((data = logic_signal->data()))) + ((data = logic_signal->logic_data()))) break; if (!data || data->get_snapshots().empty()) diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp index b1d0037a..fb84d70a 100644 --- a/pv/view/logicsignal.cpp +++ b/pv/view/logicsignal.cpp @@ -76,7 +76,7 @@ LogicSignal::~LogicSignal() { } -boost::shared_ptr LogicSignal::data() const +boost::shared_ptr LogicSignal::logic_data() const { return _data; } diff --git a/pv/view/logicsignal.h b/pv/view/logicsignal.h index 92d4cb0f..86c411a0 100644 --- a/pv/view/logicsignal.h +++ b/pv/view/logicsignal.h @@ -54,7 +54,7 @@ public: virtual ~LogicSignal(); - boost::shared_ptr data() const; + boost::shared_ptr logic_data() const; /** * Paints the background layer of the signal with a QPainter -- 2.30.2