Rename 'probe' to 'channel' everywhere.

[pulseview.git] / pv / device / devinst.h

diff --git a/pv/device/devinst.h b/pv/device/devinst.h
index e6a5140989dcea0a58ec8ace4a40bae4714eba3a..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
 
+#include <memory>
 #include <string>
 
-#include <boost/shared_ptr.hpp>
-
 #include <QObject>
 
 #include <glib.h>
@@ -35,9 +34,9 @@ struct sr_dev_inst;
 struct sr_channel;
 struct sr_channel_group;
 
-namespace pv {
+#include <pv/sigsession.h>
 
-class SigSession;
+namespace pv {
 
 namespace device {
 
@@ -65,7 +64,7 @@ public:
 
        GVariant* list_config(const sr_channel_group *group, int key);
 
-       void enable_probe(const sr_channel *probe, bool enable = true);
+       void enable_channel(const sr_channel *channel, bool enable = true);
 
        /**
         * @brief Gets the sample limit from the driver.
@@ -82,7 +81,7 @@ public:
 
        virtual void run();
 
-signals:
+Q_SIGNALS:
        void config_changed();
 
 protected: