Moved DevInst into the pv::device namespace

[pulseview.git] / pv / sigsession.h

diff --git a/pv/sigsession.h b/pv/sigsession.h
index a9a7ce23dce93b5bbd70efdabc3c84a7bf1db4c3..6b2e75999c06da96430924d8674fd64c90ccd422 100644 (file)
--- a/pv/sigsession.h
+++ b/pv/sigsession.h
@@ -41,7 +41,6 @@ struct srd_probe;
 namespace pv {
 
 class DeviceManager;
-class DevInst;
 
 namespace data {
 class Analog;
@@ -51,6 +50,10 @@ class LogicSnapshot;
 class SignalData;
 }
 
+namespace device {
+class DevInst;
+}
+
 namespace view {
 class DecodeTrace;
 class LogicSignal;
@@ -73,14 +76,14 @@ public:
 
        ~SigSession();
 
-       boost::shared_ptr<DevInst> get_device() const;
+       boost::shared_ptr<device::DevInst> get_device() const;
 
        /**
         * Sets device instance that will be used in the next capture session.
         */
-       void set_device(boost::shared_ptr<DevInst> dev_inst);
+       void set_device(boost::shared_ptr<device::DevInst> dev_inst);
 
-       void release_device(boost::shared_ptr<DevInst> dev_inst);
+       void release_device(boost::shared_ptr<device::DevInst> dev_inst);
 
        void load_file(const std::string &name,
                boost::function<void (const QString)> error_handler);
@@ -108,7 +111,7 @@ public:
 private:
        void set_capture_state(capture_state state);
 
-       void update_signals(boost::shared_ptr<DevInst> dev_inst);
+       void update_signals(boost::shared_ptr<device::DevInst> dev_inst);
 
        bool is_trigger_enabled() const;
 
@@ -139,7 +142,7 @@ private:
        void load_input_thread_proc(const std::string name, sr_input *in,
                boost::function<void (const QString)> error_handler);
 
-       void sample_thread_proc(boost::shared_ptr<DevInst> dev_inst,
+       void sample_thread_proc(boost::shared_ptr<device::DevInst> dev_inst,
                boost::function<void (const QString)> error_handler);
 
        void feed_in_header(const sr_dev_inst *sdi);
@@ -163,7 +166,7 @@ private:
        /**
         * The device instance that will be used in the next capture session.
         */
-       boost::shared_ptr<DevInst> _dev_inst;
+       boost::shared_ptr<device::DevInst> _dev_inst;
 
        std::vector< boost::shared_ptr<view::DecodeTrace> > _decode_traces;