X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdialogs%2Fconnect.h;h=b46da06fdfc28ce55645323750b94e5a95dc7a69;hb=8dbbc7f0b9ea59d0f0d62225772f8a56eee125f5;hp=a3f05ee1a6a224e1936843d11b2b30b508a50103;hpb=f9abf97e78bc4825d80926b0ebc6cbaef40768b1;p=pulseview.git

diff --git a/pv/dialogs/connect.h b/pv/dialogs/connect.h
index a3f05ee..b46da06 100644
--- a/pv/dialogs/connect.h
+++ b/pv/dialogs/connect.h
@@ -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 Device;
-}
-
 namespace dialogs {
 
 class Connect : public QDialog
@@ -52,7 +53,7 @@ class Connect : public QDialog
 public:
 	Connect(QWidget *parent, pv::DeviceManager &device_manager);
 
-	std::shared_ptr<device::Device> get_selected_device() const;
+	std::shared_ptr<sigrok::HardwareDevice> get_selected_device() const;
 
 private:
 	void populate_drivers();
@@ -61,32 +62,27 @@ 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;
+	pv::DeviceManager &device_manager_;
 
-	QVBoxLayout _layout;
+	QVBoxLayout layout_;
 
-	QWidget _form;
-	QFormLayout _form_layout;
+	QWidget form_;
+	QFormLayout form_layout_;
 
-	QComboBox _drivers;
+	QComboBox drivers_;
 
-	QLineEdit _serial_device;
+	QLineEdit serial_device_;
 
-	QPushButton _scan_button;
-	QListWidget _device_list;
-	std::map<const sr_dev_inst*, std::shared_ptr<pv::device::Device> >
-		_device_map;
+	QPushButton scan_button_;
+	QListWidget device_list_;
 
-	QDialogButtonBox _button_box;
+	QDialogButtonBox button_box_;
 };
 
 } // namespace dialogs