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 0f272cae73a6eb8e0d94b5cf7fe3ee296896acee..5a8b1cd0baf07d7974535c4db4bb951616f05262 100644
(file)
--- a/
pv/dialogs/connect.h
+++ b/
pv/dialogs/connect.h
@@
-38,7
+38,10
@@
struct sr_dev_inst;
namespace pv {
class DeviceManager;
namespace pv {
class DeviceManager;
+
+namespace device {
class DevInst;
class DevInst;
+}
namespace dialogs {
namespace dialogs {
@@
-49,7
+52,7
@@
class Connect : public QDialog
public:
Connect(QWidget *parent, pv::DeviceManager &device_manager);
public:
Connect(QWidget *parent, pv::DeviceManager &device_manager);
- boost::shared_ptr<DevInst> get_selected_device() const;
+ boost::shared_ptr<
device::
DevInst> get_selected_device() const;
private:
void populate_drivers();
private:
void populate_drivers();
@@
-80,7
+83,7
@@
private:
QPushButton _scan_button;
QListWidget _device_list;
QPushButton _scan_button;
QListWidget _device_list;
- std::map<const sr_dev_inst*, boost::shared_ptr<pv::DevInst> >
+ std::map<const sr_dev_inst*, boost::shared_ptr<pv::
device::
DevInst> >
_device_map;
QDialogButtonBox _button_box;
_device_map;
QDialogButtonBox _button_box;