projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix an isnan() issue on (at least) MinGW and Mac OS X.
[pulseview.git]
/
pv
/
toolbars
/
samplingbar.hpp
diff --git
a/pv/toolbars/samplingbar.hpp
b/pv/toolbars/samplingbar.hpp
index 25ce23ae9ccffb9463966652e988eb3d8092e9f4..10e70cb9bed9b94f944c015976a03b57d7284167 100644
(file)
--- a/
pv/toolbars/samplingbar.hpp
+++ b/
pv/toolbars/samplingbar.hpp
@@
-31,7
+31,7
@@
#include <QToolBar>
#include <QToolButton>
#include <QToolBar>
#include <QToolButton>
-#include <pv/s
igs
ession.hpp>
+#include <pv/session.hpp>
#include <pv/widgets/popuptoolbutton.hpp>
#include <pv/widgets/sweeptimingwidget.hpp>
#include <pv/widgets/popuptoolbutton.hpp>
#include <pv/widgets/sweeptimingwidget.hpp>
@@
-63,7
+63,7
@@
public:
SamplingBar(Session &session, pv::MainWindow &main_window);
void set_device_list(
SamplingBar(Session &session, pv::MainWindow &main_window);
void set_device_list(
- const std::list< std::
pair<std::shared_ptr<sigrok::Device>, std::string
> > &devices,
+ const std::list< std::
shared_ptr<sigrok::Device
> > &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;