X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fpopups%2Fchannels.cpp;h=61a8aee071b382e9fc626a89ec08e2cda7975213;hb=ef2986c0f3e0ce3346a28d86348d8cc1746e9b66;hp=beacfb436d8eaf0166522e233ca822316277716c;hpb=8dbbc7f0b9ea59d0f0d62225772f8a56eee125f5;p=pulseview.git

diff --git a/pv/popups/channels.cpp b/pv/popups/channels.cpp
index beacfb4..61a8aee 100644
--- a/pv/popups/channels.cpp
+++ b/pv/popups/channels.cpp
@@ -25,13 +25,13 @@
 #include <QGridLayout>
 #include <QLabel>
 
-#include "channels.h"
+#include "channels.hpp"
 
-#include <pv/prop/binding/deviceoptions.h>
-#include <pv/sigsession.h>
-#include <pv/view/signal.h>
+#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())) &&