X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdialogs%2Fconnect.hpp;h=a8f793ac1dc3e8f4b73ee9b9f86ead60c19343c6;hb=953a50d1cbbfe746c3ecc641addbc3937f9723e8;hp=b46da06fdfc28ce55645323750b94e5a95dc7a69;hpb=2acdb232d6bb452cfdfaea3ef5218fb4da592329;p=pulseview.git

diff --git a/pv/dialogs/connect.hpp b/pv/dialogs/connect.hpp
index b46da06f..a8f793ac 100644
--- a/pv/dialogs/connect.hpp
+++ b/pv/dialogs/connect.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_CONNECT_H
-#define PULSEVIEW_PV_CONNECT_H
+#ifndef PULSEVIEW_PV_CONNECT_HPP
+#define PULSEVIEW_PV_CONNECT_HPP
 
 #include <memory>
 
@@ -33,12 +33,17 @@
 #include <QVBoxLayout>
 
 namespace sigrok {
-	class Driver;
-	class HardwareDevice;
+class Driver;
+}
+
+namespace pv {
+namespace devices {
+class HardwareDevice;
+}
 }
 
 Q_DECLARE_METATYPE(std::shared_ptr<sigrok::Driver>);
-Q_DECLARE_METATYPE(std::shared_ptr<sigrok::HardwareDevice>);
+Q_DECLARE_METATYPE(std::shared_ptr<pv::devices::HardwareDevice>);
 
 namespace pv {
 
@@ -53,14 +58,16 @@ class Connect : public QDialog
 public:
 	Connect(QWidget *parent, pv::DeviceManager &device_manager);
 
-	std::shared_ptr<sigrok::HardwareDevice> get_selected_device() const;
+	std::shared_ptr<devices::HardwareDevice> get_selected_device() const;
 
 private:
 	void populate_drivers();
 
+	void populate_serials(std::shared_ptr<sigrok::Driver> driver);
+
 	void unset_connection();
 
-	void set_serial_connection();
+	void set_serial_connection(std::shared_ptr<sigrok::Driver> driver);
 
 private Q_SLOTS:
 	void device_selected(int index);
@@ -77,7 +84,7 @@ private:
 
 	QComboBox drivers_;
 
-	QLineEdit serial_device_;
+	QComboBox serial_devices_;
 
 	QPushButton scan_button_;
 	QListWidget device_list_;
@@ -88,4 +95,4 @@ private:
 } // namespace dialogs
 } // namespace pv
 
-#endif // PULSEVIEW_PV_CONNECT_H
+#endif // PULSEVIEW_PV_CONNECT_HPP