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

diff --git a/pv/popups/channels.cpp b/pv/popups/channels.cpp
index beacfb4..c00863b 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/deviceoptions.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,7 +151,7 @@ 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::DeviceOptions;
 
 	// 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