projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use device::Devices to represent sigrok Devices
[pulseview.git]
/
pv
/
view
/
logicsignal.hpp
diff --git
a/pv/view/logicsignal.hpp
b/pv/view/logicsignal.hpp
index 4df0f8ce77d99f74fbc1c388c773b625b3810c0e..0705613eb3b9252de57eb566d59505cba297ff1c 100644
(file)
--- a/
pv/view/logicsignal.hpp
+++ b/
pv/view/logicsignal.hpp
@@
-31,12
+31,15
@@
class QIcon;
class QToolBar;
namespace sigrok {
class QToolBar;
namespace sigrok {
- class Device;
- class TriggerMatchType;
+class TriggerMatchType;
}
namespace pv {
}
namespace pv {
+namespace devices {
+class Device;
+}
+
namespace data {
class Logic;
}
namespace data {
class Logic;
}
@@
-65,7
+68,7
@@
private:
public:
LogicSignal(pv::Session &session,
public:
LogicSignal(pv::Session &session,
- std::shared_ptr<
sigrok
::Device> device,
+ std::shared_ptr<
devices
::Device> device,
std::shared_ptr<sigrok::Channel> channel,
std::shared_ptr<pv::data::Logic> data);
std::shared_ptr<sigrok::Channel> channel,
std::shared_ptr<pv::data::Logic> data);
@@
-127,7
+130,7
@@
private Q_SLOTS:
void on_trigger();
private:
void on_trigger();
private:
- std::shared_ptr<
sigrok
::Device> device_;
+ std::shared_ptr<
pv::devices
::Device> device_;
std::shared_ptr<pv::data::Logic> data_;
const sigrok::TriggerMatchType *trigger_match_;
std::shared_ptr<pv::data::Logic> data_;
const sigrok::TriggerMatchType *trigger_match_;