projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moved DevInst into the pv::device namespace
[pulseview.git]
/
pv
/
dialogs
/
connect.h
diff --git
a/pv/dialogs/connect.h
b/pv/dialogs/connect.h
index 257efd359b860da1f721dc9a9c9aba0454d40750..5a8b1cd0baf07d7974535c4db4bb951616f05262 100644
(file)
--- a/
pv/dialogs/connect.h
+++ b/
pv/dialogs/connect.h
@@
-21,6
+21,8
@@
#ifndef PULSEVIEW_PV_CONNECT_H
#define PULSEVIEW_PV_CONNECT_H
#ifndef PULSEVIEW_PV_CONNECT_H
#define PULSEVIEW_PV_CONNECT_H
+#include <boost/shared_ptr.hpp>
+
#include <QComboBox>
#include <QDialog>
#include <QDialogButtonBox>
#include <QComboBox>
#include <QDialog>
#include <QDialogButtonBox>
@@
-37,6
+39,10
@@
namespace pv {
class DeviceManager;
class DeviceManager;
+namespace device {
+class DevInst;
+}
+
namespace dialogs {
class Connect : public QDialog
namespace dialogs {
class Connect : public QDialog
@@
-46,7
+52,7
@@
class Connect : public QDialog
public:
Connect(QWidget *parent, pv::DeviceManager &device_manager);
public:
Connect(QWidget *parent, pv::DeviceManager &device_manager);
-
struct sr_dev_inst*
get_selected_device() const;
+
boost::shared_ptr<device::DevInst>
get_selected_device() const;
private:
void populate_drivers();
private:
void populate_drivers();
@@
-77,6
+83,8
@@
private:
QPushButton _scan_button;
QListWidget _device_list;
QPushButton _scan_button;
QListWidget _device_list;
+ std::map<const sr_dev_inst*, boost::shared_ptr<pv::device::DevInst> >
+ _device_map;
QDialogButtonBox _button_box;
};
QDialogButtonBox _button_box;
};