projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove broken assert().
[pulseview.git]
/
pv
/
toolbars
/
samplingbar.h
diff --git
a/pv/toolbars/samplingbar.h
b/pv/toolbars/samplingbar.h
index e59d2f9f0b195da8417c126de2ea6f4ec7f53539..0f4c2ee5549b92cd2c3d9f40c168b1fa9b690207 100644
(file)
--- a/
pv/toolbars/samplingbar.h
+++ b/
pv/toolbars/samplingbar.h
@@
-25,8
+25,7
@@
#include <list>
#include <map>
#include <list>
#include <map>
-
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <QComboBox>
#include <QDoubleSpinBox>
#include <QComboBox>
#include <QDoubleSpinBox>
@@
-62,15
+61,15
@@
public:
SamplingBar(SigSession &session, QWidget *parent);
void set_device_list(
SamplingBar(SigSession &session, QWidget *parent);
void set_device_list(
- const std::list<
boost
::shared_ptr<pv::device::DevInst> >
+ const std::list<
std
::shared_ptr<pv::device::DevInst> >
&devices,
&devices,
-
boost
::shared_ptr<pv::device::DevInst> selected);
+
std
::shared_ptr<pv::device::DevInst> selected);
-
boost
::shared_ptr<pv::device::DevInst> get_selected_device() const;
+
std
::shared_ptr<pv::device::DevInst> get_selected_device() const;
void set_capture_state(pv::SigSession::capture_state state);
void set_capture_state(pv::SigSession::capture_state state);
-
signals
:
+
Q_SIGNALS
:
void run_stop();
private:
void run_stop();
private:
@@
-81,7
+80,7
@@
private:
void commit_sample_rate();
void commit_sample_count();
void commit_sample_rate();
void commit_sample_count();
-private
slots
:
+private
Q_SLOTS
:
void on_device_selected();
void on_sample_count_changed();
void on_sample_rate_changed();
void on_device_selected();
void on_sample_count_changed();
void on_sample_rate_changed();
@@
-89,11
+88,14
@@
private slots:
void on_config_changed();
void on_config_changed();
+protected:
+ bool eventFilter(QObject *watched, QEvent *event);
+
private:
SigSession &_session;
QComboBox _device_selector;
private:
SigSession &_session;
QComboBox _device_selector;
- std::map<const sr_dev_inst*,
boost
::weak_ptr<device::DevInst> >
+ std::map<const sr_dev_inst*,
std
::weak_ptr<device::DevInst> >
_device_selector_map;
bool _updating_device_selector;
_device_selector_map;
bool _updating_device_selector;