projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
TraceTreeItemOwner: Make list_by_type return a vector instead of a set
[pulseview.git]
/
pv
/
popups
/
channels.cpp
diff --git
a/pv/popups/channels.cpp
b/pv/popups/channels.cpp
index 3d209e84bb15a9350cc7445966c15fbde81f3b08..6c122b1c2bbaf16b31c488797e46e72e594c4834 100644
(file)
--- a/
pv/popups/channels.cpp
+++ b/
pv/popups/channels.cpp
@@
-28,6
+28,7
@@
#include "channels.hpp"
#include <pv/binding/device.hpp>
#include "channels.hpp"
#include <pv/binding/device.hpp>
+#include <pv/devices/device.hpp>
#include <pv/session.hpp>
#include <pv/view/signal.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_);
// 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
assert(device);
// Collect a set of signals
@@
-109,7
+110,7
@@
Channels::Channels(Session &session, QWidget *parent) :
}
// Create a group
}
// 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()),
// 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;
check_box_signal_map_[checkbox] = sig;
- if(++col >= 8)
+ if
(++col >= 8)
col = 0, row++;
}
col = 0, row++;
}