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

diff --git a/pv/dialogs/connect.h b/pv/dialogs/connect.h
index 5a8b1cd..fbac9e3 100644
--- a/pv/dialogs/connect.h
+++ b/pv/dialogs/connect.h
@@ -21,7 +21,7 @@
 #ifndef PULSEVIEW_PV_CONNECT_H
 #define PULSEVIEW_PV_CONNECT_H
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 #include <QComboBox>
 #include <QDialog>
@@ -32,17 +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 device {
-class DevInst;
-}
-
 namespace dialogs {
 
 class Connect : public QDialog
@@ -52,7 +53,7 @@ class Connect : public QDialog
 public:
 	Connect(QWidget *parent, pv::DeviceManager &device_manager);
 
-	boost::shared_ptr<device::DevInst> get_selected_device() const;
+	std::shared_ptr<sigrok::HardwareDevice> get_selected_device() const;
 
 private:
 	void populate_drivers();
@@ -61,14 +62,11 @@ 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);
-
 private:
 	pv::DeviceManager &_device_manager;
 
@@ -83,8 +81,6 @@ private:
 
 	QPushButton _scan_button;
 	QListWidget _device_list;
-	std::map<const sr_dev_inst*, boost::shared_ptr<pv::device::DevInst> >
-		_device_map;
 
 	QDialogButtonBox _button_box;
 };