projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Made DeviceManager only handle Device objects
[pulseview.git]
/
pv
/
dialogs
/
connect.h
diff --git
a/pv/dialogs/connect.h
b/pv/dialogs/connect.h
index 5a8b1cd0baf07d7974535c4db4bb951616f05262..1de0ed8de9adaec3b68787c4261c1dc332d72fa0 100644
(file)
--- a/
pv/dialogs/connect.h
+++ b/
pv/dialogs/connect.h
@@
-40,7
+40,7
@@
namespace pv {
class DeviceManager;
namespace device {
class DeviceManager;
namespace device {
-class Dev
Inst
;
+class Dev
ice
;
}
namespace dialogs {
}
namespace dialogs {
@@
-52,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<device::Dev
Inst
> get_selected_device() const;
+ boost::shared_ptr<device::Dev
ice
> get_selected_device() const;
private:
void populate_drivers();
private:
void populate_drivers();
@@
-83,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::device::Dev
Inst
> >
+ std::map<const sr_dev_inst*, boost::shared_ptr<pv::device::Dev
ice
> >
_device_map;
QDialogButtonBox _button_box;
_device_map;
QDialogButtonBox _button_box;