X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdialogs%2Fconnect.hpp;h=914c58783ee3693b87ed6b7c2a3232c0eb119a62;hp=ce97ba80895959d8cf4241e2989e1af99116be28;hb=521bac13ae900d74005e5d76e2c88f586ec7367a;hpb=1ebe875c5a51548c5182353e76c090215a3e5930

diff --git a/pv/dialogs/connect.hpp b/pv/dialogs/connect.hpp
index ce97ba8..914c587 100644
--- a/pv/dialogs/connect.hpp
+++ b/pv/dialogs/connect.hpp
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef PULSEVIEW_PV_CONNECT_HPP
@@ -30,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;
 }
@@ -45,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 {
 
@@ -61,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();
 
@@ -93,7 +94,7 @@ private:
 	QWidget *tcp_config_;
 	QLineEdit *tcp_host_;
 	QSpinBox *tcp_port_;
-	QCheckBox *tcp_use_vxi_;
+	QComboBox *tcp_protocol_;
 
 	QPushButton scan_button_;
 	QListWidget device_list_;