X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdialogs%2Fconnect.h;h=fbac9e3ecf23f51f8c71267b269a2011a43f9e91;hb=e8d009288de28cb194bc7964f96677c2baf900c9;hp=eeb108c105dd5a4c28edaf4e658ed10fa2e137f6;hpb=5eb0fa13029207c45748ff572568542782e6d2a8;p=pulseview.git

diff --git a/pv/dialogs/connect.h b/pv/dialogs/connect.h
index eeb108c..fbac9e3 100644
--- 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 <memory>
+
 #include <QComboBox>
 #include <QDialog>
 #include <QDialogButtonBox>
@@ -30,10 +32,18 @@
 #include <QPushButton>
 #include <QVBoxLayout>
 
-struct sr_config;
-struct sr_dev_inst;
+namespace sigrok {
+	class Driver;
+	class HardwareDevice;
+}
+
+Q_DECLARE_METATYPE(std::shared_ptr<sigrok::Driver>);
+Q_DECLARE_METATYPE(std::shared_ptr<sigrok::HardwareDevice>);
 
 namespace pv {
+
+class DeviceManager;
+
 namespace dialogs {
 
 class Connect : public QDialog
@@ -41,9 +51,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;
+	std::shared_ptr<sigrok::HardwareDevice> get_selected_device() const;
 
 private:
 	void populate_drivers();
@@ -52,15 +62,14 @@ private:
 
 	void set_serial_connection();
 
-private slots:
+private Q_SLOTS:
 	void device_selected(int index);
 
 	void scan_pressed();
 
 private:
-	static void free_drvopts(sr_config *src);
+	pv::DeviceManager &_device_manager;
 
-private:
 	QVBoxLayout _layout;
 
 	QWidget _form;