X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdialogs%2Fconnect.hpp;h=fe158740760c2e3964350b9990a95146ec81f86a;hp=e14972abd47150824dec6d811596df855bcec014;hb=8845be3c9c7d5aca02fb2efc4038f4735a5242d6;hpb=efdec55aec1a137460fa362a381ed1904182bfed

diff --git a/pv/dialogs/connect.hpp b/pv/dialogs/connect.hpp
index e14972ab..fe158740 100644
--- a/pv/dialogs/connect.hpp
+++ b/pv/dialogs/connect.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_CONNECT_HPP
-#define PULSEVIEW_PV_CONNECT_HPP
+#ifndef PULSEVIEW_PV_DIALOGS_CONNECT_HPP
+#define PULSEVIEW_PV_DIALOGS_CONNECT_HPP
 
 #include <memory>
 
@@ -29,11 +29,13 @@
 #include <QFormLayout>
 #include <QHBoxLayout>
 #include <QLineEdit>
-#include <QSpinBox>
 #include <QListWidget>
 #include <QPushButton>
+#include <QSpinBox>
 #include <QVBoxLayout>
 
+using std::shared_ptr;
+
 namespace sigrok {
 class Driver;
 }
@@ -44,8 +46,8 @@ class HardwareDevice;
 }
 }
 
-Q_DECLARE_METATYPE(std::shared_ptr<sigrok::Driver>);
-Q_DECLARE_METATYPE(std::shared_ptr<pv::devices::HardwareDevice>);
+Q_DECLARE_METATYPE(shared_ptr<sigrok::Driver>);
+Q_DECLARE_METATYPE(shared_ptr<pv::devices::HardwareDevice>);
 
 namespace pv {
 
@@ -60,12 +62,12 @@ class Connect : public QDialog
 public:
 	Connect(QWidget *parent, pv::DeviceManager &device_manager);
 
-	std::shared_ptr<devices::HardwareDevice> get_selected_device() const;
+	shared_ptr<devices::HardwareDevice> get_selected_device() const;
 
 private:
 	void populate_drivers();
 
-	void populate_serials(std::shared_ptr<sigrok::Driver> driver);
+	void populate_serials(shared_ptr<sigrok::Driver> driver);
 
 	void unset_connection();
 
@@ -87,12 +89,13 @@ private:
 
 	QComboBox drivers_;
 
-	QComboBox serial_devices_;
+	QWidget *serial_config_;
+	QComboBox serial_devices_, serial_baudrate_;
 
 	QWidget *tcp_config_;
 	QLineEdit *tcp_host_;
 	QSpinBox *tcp_port_;
-	QCheckBox *tcp_use_vxi_;
+	QComboBox *tcp_protocol_;
 
 	QPushButton scan_button_;
 	QListWidget device_list_;
@@ -103,4 +106,4 @@ private:
 } // namespace dialogs
 } // namespace pv
 
-#endif // PULSEVIEW_PV_CONNECT_HPP
+#endif // PULSEVIEW_PV_DIALOGS_CONNECT_HPP