Fix a few #include guard inconsistencies.

[pulseview.git] / pv / dialogs / connect.hpp

diff --git a/pv/dialogs/connect.hpp b/pv/dialogs/connect.hpp
index b35f5899f502d0419f87a456d0cabe8f5485a53b..fe158740760c2e3964350b9990a95146ec81f86a 100644 (file)
--- 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,9 +29,9 @@
 #include <QFormLayout>
 #include <QHBoxLayout>
 #include <QLineEdit>
-#include <QSpinBox>
 #include <QListWidget>
 #include <QPushButton>
+#include <QSpinBox>
 #include <QVBoxLayout>
 
 using std::shared_ptr;
@@ -89,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_;
@@ -105,4 +106,4 @@ private:
 } // namespace dialogs
 } // namespace pv
 
-#endif // PULSEVIEW_PV_CONNECT_HPP
+#endif // PULSEVIEW_PV_DIALOGS_CONNECT_HPP