projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added pv::view::RowItemIterator
[pulseview.git]
/
pv
/
toolbars
/
samplingbar.h
diff --git
a/pv/toolbars/samplingbar.h
b/pv/toolbars/samplingbar.h
index 7c0ec9af2d75a2d29577e7d5126f1b2c78c717ee..d8d81219659e9a0cc19ca496ef8e11a6fcb2b234 100644
(file)
--- a/
pv/toolbars/samplingbar.h
+++ b/
pv/toolbars/samplingbar.h
@@
-23,7
+23,7
@@
#include <stdint.h>
#include <stdint.h>
-#include <
map
>
+#include <
list
>
#include <memory>
#include <QComboBox>
#include <memory>
#include <QComboBox>
@@
-62,8
+62,7
@@
public:
SamplingBar(SigSession &session, QWidget *parent);
void set_device_list(
SamplingBar(SigSession &session, QWidget *parent);
void set_device_list(
- const std::map< std::shared_ptr<sigrok::Device>, std::string >
- &device_names,
+ const std::list< std::pair<std::shared_ptr<sigrok::Device>, std::string> > &devices,
std::shared_ptr<sigrok::Device> selected);
std::shared_ptr<sigrok::Device> get_selected_device() const;
std::shared_ptr<sigrok::Device> selected);
std::shared_ptr<sigrok::Device> get_selected_device() const;