projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make member variable underscores a suffix instead of a prefix
[pulseview.git]
/
pv
/
view
/
signal.h
diff --git
a/pv/view/signal.h
b/pv/view/signal.h
index c003de698e3328e9301d1d9148698c3886333d75..b3b591b28352484c1b2dd379763174d4ac2cd9ae 100644
(file)
--- a/
pv/view/signal.h
+++ b/
pv/view/signal.h
@@
-30,18
+30,18
@@
#include "trace.h"
#include "trace.h"
-struct sr_channel;
+namespace sigrok {
+ class Channel;
+}
namespace pv {
namespace pv {
+class SigSession;
+
namespace data {
class SignalData;
}
namespace data {
class SignalData;
}
-namespace device {
-class DevInst;
-}
-
namespace view {
class Signal : public Trace
namespace view {
class Signal : public Trace
@@
-49,8
+49,8
@@
class Signal : public Trace
Q_OBJECT
protected:
Q_OBJECT
protected:
- Signal(
std::shared_ptr<pv::device::DevInst> dev_inst
,
-
const sr_channel *const probe
);
+ Signal(
pv::SigSession &session
,
+
std::shared_ptr<sigrok::Channel> channel
);
public:
/**
public:
/**
@@
-67,7
+67,7
@@
public:
void enable(bool enable = true);
void enable(bool enable = true);
-
const sr_channel* probe
() const;
+
std::shared_ptr<sigrok::Channel> channel
() const;
virtual void populate_popup_form(QWidget *parent, QFormLayout *form);
virtual void populate_popup_form(QWidget *parent, QFormLayout *form);
@@
-75,17
+75,15
@@
public:
void delete_pressed();
void delete_pressed();
- bool eventFilter(QObject *obj, QEvent *evt);
-
-private slots:
+private Q_SLOTS:
void on_disable();
protected:
void on_disable();
protected:
-
std::shared_ptr<pv::device::DevInst> _dev_inst
;
-
const sr_channel *const _probe
;
+
pv::SigSession &session_
;
+
std::shared_ptr<sigrok::Channel> channel_
;
- QComboBox *
_name_widget
;
- bool
_updating_name_widget
;
+ QComboBox *
name_widget_
;
+ bool
updating_name_widget_
;
};
} // namespace view
};
} // namespace view