X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdialogs%2Fconnect.h;h=e1a2c30d6c68422fbc37858c2be491702860e42d;hb=e9213170687cf4afd14e20acdc690ff9381d94ae;hp=5a8b1cd0baf07d7974535c4db4bb951616f05262;hpb=945745012eb57cefa1ef457daf48cfffa99f9ec2;p=pulseview.git diff --git a/pv/dialogs/connect.h b/pv/dialogs/connect.h index 5a8b1cd..e1a2c30 100644 --- a/pv/dialogs/connect.h +++ b/pv/dialogs/connect.h @@ -21,7 +21,7 @@ #ifndef PULSEVIEW_PV_CONNECT_H #define PULSEVIEW_PV_CONNECT_H -#include +#include #include #include @@ -40,7 +40,7 @@ namespace pv { class DeviceManager; namespace device { -class DevInst; +class Device; } namespace dialogs { @@ -52,7 +52,7 @@ class Connect : public QDialog public: Connect(QWidget *parent, pv::DeviceManager &device_manager); - boost::shared_ptr get_selected_device() const; + std::shared_ptr get_selected_device() const; private: void populate_drivers(); @@ -61,7 +61,7 @@ private: void set_serial_connection(); -private slots: +private Q_SLOTS: void device_selected(int index); void scan_pressed(); @@ -83,7 +83,7 @@ private: QPushButton _scan_button; QListWidget _device_list; - std::map > + std::map > _device_map; QDialogButtonBox _button_box;