projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename 'probe' to 'channel' everywhere.
[pulseview.git]
/
pv
/
device
/
devinst.h
diff --git
a/pv/device/devinst.h
b/pv/device/devinst.h
index bdadc2c3e72e44eccc2ca7012f3260358d412824..5a994372d347ca76dca32d151760a6b735d358a9 100644
(file)
--- a/
pv/device/devinst.h
+++ b/
pv/device/devinst.h
@@
-21,10
+21,9
@@
#ifndef PULSEVIEW_PV_DEVICE_DEVINST_H
#define PULSEVIEW_PV_DEVICE_DEVINST_H
#ifndef PULSEVIEW_PV_DEVICE_DEVINST_H
#define PULSEVIEW_PV_DEVICE_DEVINST_H
+#include <memory>
#include <string>
#include <string>
-#include <boost/shared_ptr.hpp>
-
#include <QObject>
#include <glib.h>
#include <QObject>
#include <glib.h>
@@
-32,12
+31,12
@@
#include <stdint.h>
struct sr_dev_inst;
#include <stdint.h>
struct sr_dev_inst;
-struct sr_
probe
;
+struct sr_
channel
;
struct sr_channel_group;
struct sr_channel_group;
-namespace pv {
+#include <pv/sigsession.h>
-class SigSession;
+namespace pv {
namespace device {
namespace device {
@@
-65,7
+64,7
@@
public:
GVariant* list_config(const sr_channel_group *group, int key);
GVariant* list_config(const sr_channel_group *group, int key);
- void enable_
probe(const sr_probe *probe
, bool enable = true);
+ void enable_
channel(const sr_channel *channel
, bool enable = true);
/**
* @brief Gets the sample limit from the driver.
/**
* @brief Gets the sample limit from the driver.
@@
-82,7
+81,7
@@
public:
virtual void run();
virtual void run();
-
signals
:
+
Q_SIGNALS
:
void config_changed();
protected:
void config_changed();
protected: