projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LogicSignal: Added an icon cache
[pulseview.git]
/
pv
/
toolbars
/
samplingbar.hpp
diff --git
a/pv/toolbars/samplingbar.hpp
b/pv/toolbars/samplingbar.hpp
index af2743118ad7441d1140869b5989632bb46e8762..25ce23ae9ccffb9463966652e988eb3d8092e9f4 100644
(file)
--- a/
pv/toolbars/samplingbar.hpp
+++ b/
pv/toolbars/samplingbar.hpp
@@
-46,7
+46,7
@@
class QAction;
namespace pv {
class MainWindow;
namespace pv {
class MainWindow;
-class S
igS
ession;
+class Session;
namespace toolbars {
namespace toolbars {
@@
-60,7
+60,7
@@
private:
static const uint64_t DefaultSampleCount;
public:
static const uint64_t DefaultSampleCount;
public:
- SamplingBar(S
igS
ession &session, pv::MainWindow &main_window);
+ SamplingBar(Session &session, pv::MainWindow &main_window);
void set_device_list(
const std::list< std::pair<std::shared_ptr<sigrok::Device>, std::string> > &devices,
void set_device_list(
const std::list< std::pair<std::shared_ptr<sigrok::Device>, std::string> > &devices,
@@
-68,7
+68,7
@@
public:
std::shared_ptr<sigrok::Device> get_selected_device() const;
std::shared_ptr<sigrok::Device> get_selected_device() const;
- void set_capture_state(pv::S
igS
ession::capture_state state);
+ void set_capture_state(pv::Session::capture_state state);
Q_SIGNALS:
void run_stop();
Q_SIGNALS:
void run_stop();
@@
-93,7
+93,7
@@
protected:
bool eventFilter(QObject *watched, QEvent *event);
private:
bool eventFilter(QObject *watched, QEvent *event);
private:
- S
igS
ession &session_;
+ Session &session_;
MainWindow &main_window_;
QComboBox device_selector_;
MainWindow &main_window_;
QComboBox device_selector_;