Renamed pv::view::LogicSignal::data to logic_data

diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp
index d6fa17cafe8b6780239be558eeec88486923c1be..7bd5e6e6c2431d4e182fbfe051aa2dc08357a577 100644 (file)
--- a/pv/data/decoderstack.cpp
+++ b/pv/data/decoderstack.cpp
@@ -125,7 +125,7 @@ void DecoderStack::begin_decode()
        BOOST_FOREACH (const shared_ptr<decode::Decoder> &dec, _stack)
                if (dec && !dec->probes().empty() &&
                        ((logic_signal = (*dec->probes().begin()).second)) &&
        BOOST_FOREACH (const shared_ptr<decode::Decoder> &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)
                        break;
 
        if (!data)

diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp
index beb83b1f20634febe91707867fca8ca0af93c77f..1d5a62684fddea143db3a8c2ee23d82793ac320c 100644 (file)
--- 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<Decoder> &dec, stack)
                if (dec && !dec->probes().empty() &&
                        ((logic_signal = (*dec->probes().begin()).second)) &&
        BOOST_FOREACH (const shared_ptr<Decoder> &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())
                        break;
 
        if (!data || data->get_snapshots().empty())

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index b1d0037adf949516d0ec5fcdef64c96eebe615e0..fb84d70a8e78dc6838678038bcfedd9e88ecb0c1 100644 (file)
--- a/pv/view/logicsignal.cpp
+++ b/pv/view/logicsignal.cpp
@@ -76,7 +76,7 @@ LogicSignal::~LogicSignal()
 {
 }
 
 {
 }
 

-boost::shared_ptr<pv::data::Logic> LogicSignal::data() const
+boost::shared_ptr<pv::data::Logic> LogicSignal::logic_data() const

 {
        return _data;
 }
 {
        return _data;
 }

diff --git a/pv/view/logicsignal.h b/pv/view/logicsignal.h
index 92d4cb0f704777589cb1681f4bde61b9518fcd50..86c411a00106fe1e78e76c21356965c52c313784 100644 (file)
--- a/pv/view/logicsignal.h
+++ b/pv/view/logicsignal.h
@@ -54,7 +54,7 @@ public:
 
        virtual ~LogicSignal();
 
 
        virtual ~LogicSignal();
 

-       boost::shared_ptr<pv::data::Logic> data() const;
+       boost::shared_ptr<pv::data::Logic> logic_data() const;

 
        /**
         * Paints the background layer of the signal with a QPainter
 
        /**
         * Paints the background layer of the signal with a QPainter