#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;
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())) &&