Moved Signal and LogicSignal into pv::view

[pulseview.git] / pv / sigsession.h

diff --git a/pv/sigsession.h b/pv/sigsession.h
index b6e5a56842c5c79def1356532001823e3eb3cd69..29929a9dde63d1b1bbc4520885d28cc3e719370e 100644 (file)
--- a/pv/sigsession.h
+++ b/pv/sigsession.h
@@ -36,7 +36,10 @@ namespace pv {
 
 class LogicData;
 class LogicDataSnapshot;
 
 class LogicData;
 class LogicDataSnapshot;

+
+namespace view {

 class Signal;
 class Signal;

+}

 
 class SigSession : public QObject
 {
 
 class SigSession : public QObject
 {


@@ -52,7 +55,7 @@ public:
        void start_capture(struct sr_dev_inst* sdi, uint64_t record_length,
                uint64_t sample_rate);
 
        void start_capture(struct sr_dev_inst* sdi, uint64_t record_length,
                uint64_t sample_rate);
 

-       std::vector< boost::shared_ptr<Signal> >&
+       std::vector< boost::shared_ptr<view::Signal> >&

                get_signals();
 
        boost::shared_ptr<LogicData> get_data();
                get_signals();
 
        boost::shared_ptr<LogicData> get_data();


@@ -65,7 +68,7 @@ private:
                struct sr_datafeed_packet *packet);
 
 private:
                struct sr_datafeed_packet *packet);
 
 private:

-       std::vector< boost::shared_ptr<Signal> > _signals;
+       std::vector< boost::shared_ptr<view::Signal> > _signals;

        boost::shared_ptr<LogicData> _logic_data;
        boost::shared_ptr<LogicDataSnapshot> _cur_logic_snapshot;
 
        boost::shared_ptr<LogicData> _logic_data;
        boost::shared_ptr<LogicDataSnapshot> _cur_logic_snapshot;