X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fpopups%2Fchannels.cpp;h=3d209e84bb15a9350cc7445966c15fbde81f3b08;hb=5d2aa2c724cd7b6693c7956d4f1c7f0f856dcc27;hp=f30ce627d72f3ae675571506f5eb58b878a57570;hpb=f65cd27bdbf70644052dd43dac4bbe9403f4dfee;p=pulseview.git

diff --git a/pv/popups/channels.cpp b/pv/popups/channels.cpp
index f30ce627..3d209e84 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/binding/device.hpp>
 #include <pv/session.hpp>
 #include <pv/view/signal.hpp>
 
-#include <libsigrok/libsigrok.hpp>
+#include <libsigrokcxx/libsigrokcxx.hpp>
 
 using namespace Qt;
 
@@ -42,6 +42,7 @@ using std::map;
 using std::mutex;
 using std::set;
 using std::shared_ptr;
+using std::unordered_set;
 using std::vector;
 
 using sigrok::Channel;
@@ -71,7 +72,7 @@ Channels::Channels(Session &session, QWidget *parent) :
 	map<shared_ptr<Channel>, shared_ptr<Signal> > signal_map;
 
 	shared_lock<shared_mutex> lock(session_.signals_mutex());
-	const vector< shared_ptr<Signal> > &sigs(session_.signals());
+	const unordered_set< shared_ptr<Signal> > &sigs(session_.signals());
 
 	for (const shared_ptr<Signal> &sig : sigs)
 		signal_map[sig->channel()] = sig;
@@ -151,14 +152,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())) &&