X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdevice%2Fdevinst.h;h=5a994372d347ca76dca32d151760a6b735d358a9;hb=6ac6242b25cfbd4df14abe7580adc9d0f4cffe43;hp=8932f1807f542b07242a48f6836565985a886229;hpb=ae2d1bc5b5aba9fcdd7fef42ef1bc9069267d6f7;p=pulseview.git

diff --git a/pv/device/devinst.h b/pv/device/devinst.h
index 8932f18..5a99437 100644
--- 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>
@@ -32,12 +31,12 @@
 #include <stdint.h>
 
 struct sr_dev_inst;
-struct sr_probe;
-struct sr_probe_group;
+struct sr_channel;
+struct sr_channel_group;
 
-namespace pv {
+#include <pv/sigsession.h>
 
-class SigSession;
+namespace pv {
 
 namespace device {
 
@@ -59,13 +58,13 @@ public:
 
 	virtual std::string format_device_title() const = 0;
 
-	GVariant* get_config(const sr_probe_group *group, int key);
+	GVariant* get_config(const sr_channel_group *group, int key);
 
-	bool set_config(const sr_probe_group *group, int key, GVariant *data);
+	bool set_config(const sr_channel_group *group, int key, GVariant *data);
 
-	GVariant* list_config(const sr_probe_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.
@@ -82,7 +81,7 @@ public:
 
 	virtual void run();
 
-signals:
+Q_SIGNALS:
 	void config_changed();
 
 protected: