Don't use Qt-defined keywords, they can cause problems with other headers.

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

diff --git a/pv/dialogs/connect.h b/pv/dialogs/connect.h
index 0f272cae73a6eb8e0d94b5cf7fe3ee296896acee..e1a2c30d6c68422fbc37858c2be491702860e42d 100644 (file)
--- 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 <boost/shared_ptr.hpp>
+#include <memory>
 
 #include <QComboBox>
 #include <QDialog>
@@ -38,7 +38,10 @@ struct sr_dev_inst;
 namespace pv {
 
 class DeviceManager;
-class DevInst;
+
+namespace device {
+class Device;
+}
 
 namespace dialogs {
 
@@ -49,7 +52,7 @@ class Connect : public QDialog
 public:
        Connect(QWidget *parent, pv::DeviceManager &device_manager);
 
-       boost::shared_ptr<DevInst> get_selected_device() const;
+       std::shared_ptr<device::Device> get_selected_device() const;
 
 private:
        void populate_drivers();
@@ -58,7 +61,7 @@ private:
 
        void set_serial_connection();
 
-private slots:
+private Q_SLOTS:
        void device_selected(int index);
 
        void scan_pressed();
@@ -80,7 +83,7 @@ private:
 
        QPushButton _scan_button;
        QListWidget _device_list;
-       std::map<const sr_dev_inst*, boost::shared_ptr<pv::DevInst> >
+       std::map<const sr_dev_inst*, std::shared_ptr<pv::device::Device> >
                _device_map;
 
        QDialogButtonBox _button_box;