projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moved pv::prop:bindings classes into pv::bindings namespace
[pulseview.git]
/
pv
/
popups
/
channels.cpp
diff --git
a/pv/popups/channels.cpp
b/pv/popups/channels.cpp
index beacfb436d8eaf0166522e233ca822316277716c..c00863b0161dc3dfd4b124f13541c8832c3efcf0 100644
(file)
--- a/
pv/popups/channels.cpp
+++ b/
pv/popups/channels.cpp
@@
-25,13
+25,13
@@
#include <QGridLayout>
#include <QLabel>
#include <QGridLayout>
#include <QLabel>
-#include "channels.h"
+#include "channels.h
pp
"
-#include <pv/
prop/binding/deviceoptions.h
>
-#include <pv/s
igsession.h
>
-#include <pv/view/signal.h>
+#include <pv/
binding/deviceoptions.hpp
>
+#include <pv/s
ession.hpp
>
+#include <pv/view/signal.h
pp
>
-#include <libsigrok
/libsigrok
.hpp>
+#include <libsigrok
cxx/libsigrokcxx
.hpp>
using namespace Qt;
using namespace Qt;
@@
-53,7
+53,7
@@
using pv::view::Signal;
namespace pv {
namespace popups {
namespace pv {
namespace popups {
-Channels::Channels(S
igS
ession &session, QWidget *parent) :
+Channels::Channels(Session &session, QWidget *parent) :
Popup(parent),
session_(session),
updating_channels_(false),
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)
{
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
// 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