X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fpopups%2Fchannels.cpp;h=6c122b1c2bbaf16b31c488797e46e72e594c4834;hb=f32905530347e1020d5ce7959123cf797c9a4829;hp=3d209e84bb15a9350cc7445966c15fbde81f3b08;hpb=78b0af3ebcbeab50e1c1634af729c0a7f97fb435;p=pulseview.git

diff --git a/pv/popups/channels.cpp b/pv/popups/channels.cpp
index 3d209e84..6c122b1c 100644
--- a/pv/popups/channels.cpp
+++ b/pv/popups/channels.cpp
@@ -28,6 +28,7 @@
 #include "channels.hpp"
 
 #include <pv/binding/device.hpp>
+#include <pv/devices/device.hpp>
 #include <pv/session.hpp>
 #include <pv/view/signal.hpp>
 
@@ -65,7 +66,7 @@ Channels::Channels(Session &session, QWidget *parent) :
 	// Create the layout
 	setLayout(&layout_);
 
-	shared_ptr<sigrok::Device> device = session_.device();
+	const shared_ptr<sigrok::Device> device = session_.device()->device();
 	assert(device);
 
 	// Collect a set of signals
@@ -109,7 +110,7 @@ Channels::Channels(Session &session, QWidget *parent) :
 	}
 
 	// Create a group
-	populate_group(NULL, global_sigs);
+	populate_group(nullptr, global_sigs);
 
 	// Create the enable/disable all buttons
 	connect(&enable_all_channels_, SIGNAL(clicked()),
@@ -199,7 +200,7 @@ QGridLayout* Channels::create_channel_group_grid(
 
 		check_box_signal_map_[checkbox] = sig;
 
-		if(++col >= 8)
+		if (++col >= 8)
 			col = 0, row++;
 	}