projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Session: Renamed files to match class name
[pulseview.git]
/
pv
/
toolbars
/
samplingbar.hpp
diff --git
a/pv/toolbars/samplingbar.hpp
b/pv/toolbars/samplingbar.hpp
index d027d60e6b3b303802e3c87164d6dba3622e1319..436304bc4ca915c88ee5a0f266a55ed66dcd2765 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>
@@
-45,7
+45,8
@@
class QAction;
namespace pv {
namespace pv {
-class SigSession;
+class MainWindow;
+class Session;
namespace toolbars {
namespace toolbars {
@@
-59,7
+60,7
@@
private:
static const uint64_t DefaultSampleCount;
public:
static const uint64_t DefaultSampleCount;
public:
- SamplingBar(S
igSession &session, QWidget *parent
);
+ SamplingBar(S
ession &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,
@@
-67,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();
@@
-92,7
+93,8
@@
protected:
bool eventFilter(QObject *watched, QEvent *event);
private:
bool eventFilter(QObject *watched, QEvent *event);
private:
- SigSession &session_;
+ Session &session_;
+ MainWindow &main_window_;
QComboBox device_selector_;
bool updating_device_selector_;
QComboBox device_selector_;
bool updating_device_selector_;