X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fpopups%2Fchannels.cpp;h=61a8aee071b382e9fc626a89ec08e2cda7975213;hp=4598f1239185219a9ce088ae7dccbd4d16ada088;hb=3cc9ad7b867853315473df611612c562d562ed8a;hpb=2acdb232d6bb452cfdfaea3ef5218fb4da592329

diff --git a/pv/popups/channels.cpp b/pv/popups/channels.cpp
index 4598f123..61a8aee0 100644
--- a/pv/popups/channels.cpp
+++ b/pv/popups/channels.cpp
@@ -27,11 +27,11 @@
 
 #include "channels.hpp"
 
-#include <pv/prop/binding/deviceoptions.hpp>
-#include <pv/sigsession.hpp>
+#include <pv/binding/device.hpp>
+#include <pv/session.hpp>
 #include <pv/view/signal.hpp>
 
-#include <libsigrok/libsigrok.hpp>
+#include <libsigrokcxx/libsigrokcxx.hpp>
 
 using namespace Qt;
 
@@ -53,7 +53,7 @@ using pv::view::Signal;
 namespace pv {
 namespace popups {
 
-Channels::Channels(SigSession &session, QWidget *parent) :
+Channels::Channels(Session &session, QWidget *parent) :
 	Popup(parent),
 	session_(session),
 	updating_channels_(false),
@@ -151,14 +151,14 @@ void Channels::set_all_channels(bool set)
 void Channels::populate_group(shared_ptr<ChannelGroup> group,
 	const vector< shared_ptr<pv::view::Signal> > sigs)
 {
-	using pv::prop::binding::DeviceOptions;
+	using pv::binding::Device;
 
 	// Only bind options if this is a group. We don't do it for general
 	// options, because these properties are shown in the device config
 	// popup.
-	shared_ptr<DeviceOptions> binding;
+	shared_ptr<Device> binding;
 	if (group)
-		binding = shared_ptr<DeviceOptions>(new DeviceOptions(group));
+		binding = shared_ptr<Device>(new Device(group));
 
 	// Create a title if the group is going to have any content
 	if ((!sigs.empty() || (binding && !binding->properties().empty())) &&