Moved DevInst into the pv::device namespace

[pulseview.git] / pv / dialogs / connect.h

diff --git a/pv/dialogs/connect.h b/pv/dialogs/connect.h
index eeb108c105dd5a4c28edaf4e658ed10fa2e137f6..5a8b1cd0baf07d7974535c4db4bb951616f05262 100644 (file)
--- a/pv/dialogs/connect.h
+++ b/pv/dialogs/connect.h
@@ -21,6 +21,8 @@
 #ifndef PULSEVIEW_PV_CONNECT_H
 #define PULSEVIEW_PV_CONNECT_H
 
+#include <boost/shared_ptr.hpp>
+
 #include <QComboBox>
 #include <QDialog>
 #include <QDialogButtonBox>
@@ -34,6 +36,13 @@ struct sr_config;
 struct sr_dev_inst;
 
 namespace pv {
+
+class DeviceManager;
+
+namespace device {
+class DevInst;
+}
+
 namespace dialogs {
 
 class Connect : public QDialog
@@ -41,9 +50,9 @@ class Connect : public QDialog
        Q_OBJECT
 
 public:
-       Connect(QWidget *parent);
+       Connect(QWidget *parent, pv::DeviceManager &device_manager);
 
-       struct sr_dev_inst* get_selected_device() const;
+       boost::shared_ptr<device::DevInst> get_selected_device() const;
 
 private:
        void populate_drivers();
@@ -61,6 +70,8 @@ private:
        static void free_drvopts(sr_config *src);
 
 private:
+       pv::DeviceManager &_device_manager;
+
        QVBoxLayout _layout;
 
        QWidget _form;
@@ -72,6 +83,8 @@ private:
 
        QPushButton _scan_button;
        QListWidget _device_list;
+       std::map<const sr_dev_inst*, boost::shared_ptr<pv::device::DevInst> >
+               _device_map;
 
        QDialogButtonBox _button_box;
 };